WebSVN – Kolibri OS – Path Comparison – / – /contrib/ Rev 8631 and /contrib/ Rev 8632

Regard whitespace Rev 8631 → Rev 8632

/contrib/kolibri-libc/loader/make.bat
File deleted
\ No newline at end of file

/contrib/kolibri-libc/loader/fseek.asm
File deleted

/contrib/kolibri-libc/loader/fputc.asm
File deleted

/contrib/kolibri-libc/loader/exit.asm
File deleted

/contrib/kolibri-libc/loader/fsetpos.asm
File deleted

/contrib/kolibri-libc/loader/fgetpos.asm
File deleted

/contrib/kolibri-libc/loader/cosh.asm
File deleted

/contrib/kolibri-libc/loader/labs.asm
File deleted

/contrib/kolibri-libc/loader/fmod.asm
File deleted

/contrib/kolibri-libc/loader/feof.asm
File deleted

/contrib/kolibri-libc/loader/modf.asm
File deleted

/contrib/kolibri-libc/loader/ldiv.asm
File deleted

/contrib/kolibri-libc/loader/gets.asm
File deleted

/contrib/kolibri-libc/loader/fgets.asm
File deleted

/contrib/kolibri-libc/loader/modfl.asm
File deleted

/contrib/kolibri-libc/loader/strncat.asm
File deleted

/contrib/kolibri-libc/loader/llabs.asm
File deleted

/contrib/kolibri-libc/loader/floor.asm
File deleted

/contrib/kolibri-libc/loader/sprintf.asm
File deleted

/contrib/kolibri-libc/loader/fputs.asm
File deleted

/contrib/kolibri-libc/loader/puts.asm
File deleted

/contrib/kolibri-libc/loader/sinh.asm
File deleted

/contrib/kolibri-libc/loader/time.asm
File deleted

/contrib/kolibri-libc/loader/pow2.asm
File deleted

/contrib/kolibri-libc/loader/strcoll.asm
File deleted

/contrib/kolibri-libc/loader/tanh.asm
File deleted

/contrib/kolibri-libc/loader/sqrt.asm
File deleted

/contrib/kolibri-libc/loader/fread.asm
File deleted

/contrib/kolibri-libc/loader/closedir.asm
File deleted

/contrib/kolibri-libc/loader/acosh.asm
File deleted

/contrib/kolibri-libc/loader/Makefile
File deleted

/contrib/kolibri-libc/loader/memset.asm
File deleted

/contrib/kolibri-libc/loader/calloc.asm
File deleted

/contrib/kolibri-libc/loader/log.asm
File deleted

/contrib/kolibri-libc/loader/div.asm
File deleted

/contrib/kolibri-libc/loader/ftell.asm
File deleted

/contrib/kolibri-libc/loader/atoll.asm
File deleted

/contrib/kolibri-libc/loader/memmove.asm
File deleted

/contrib/kolibri-libc/loader/frexp.asm
File deleted

/contrib/kolibri-libc/loader/ferror.asm
File deleted

/contrib/kolibri-libc/loader/memcmp.asm
File deleted

/contrib/kolibri-libc/loader/clearerr.asm
File deleted

/contrib/kolibri-libc/loader/difftime.asm
File deleted

/contrib/kolibri-libc/loader/malloc.asm
File deleted

/contrib/kolibri-libc/loader/fopen.asm
File deleted

/contrib/kolibri-libc/loader/strrchr.asm
File deleted

/contrib/kolibri-libc/loader/strxfrm.asm
File deleted

/contrib/kolibri-libc/loader/mktime.asm
File deleted

 /contrib/kolibri-libc/loader/symbols.txt
 ,6 → 44,7
 getchar
 gets
 hypot
+itoa
 labs
 ldexp
 ldiv
 ,6 → 76,13
 rewind
 rewinddir
 seekdir
+shell_printf
+shell_puts
+shell_putc
+shell_getc
+shell_gets
+shell_cls
+shell_exit
 setbuf
 setvbuf
 sin

 /contrib/kolibri-libc/samples/Makefile
 ,6 → 17,11
         $(KTCC) $(KTCC_FLAGS) $(NAME).c -o $(NAME) -lc
         $(KPACK) $(NAME)
+dynamic_kgcc:
+        $(KGCC) -D_DYNAMIC $(NAME).c
+        $(KLD) $(NAME).o -o $(NAME) -lc.obj
+        $(KPACK) $(NAME)
 dynamic_tcc:
         $(KTCC) $(KTCC_FLAGS) -D_DYNAMIC $(NAME).c -o $(NAME)_dyn  -lc.obj
         $(KPACK) $(NAME)_dyn

 /contrib/kolibri-libc/samples/shell_io.c
 ,10 → 2,14
 #include <ksys.h>
 #include <stdio.h>
-int main()
+int main(int argc, char**argv)
 {
     char string[256];
     shell_cls();
+    shell_printf("Number of arguments %d\n",argc);
+    for(int i=0; i<argc; i++){
+        shell_printf("argv[%d]=%s\n", i, argv[i]);
+    }
     shell_puts("This is a test console application for Shell\n\r");
     shell_puts("Type a string (255 symbols max): ");
     shell_gets(string);

 /contrib/kolibri-libc/source/Makefile
 ,7 → 47,7
 shared: $(cfiles) $(asmfiles)
         $(CLINK) $^
-        #$(KPACK) a.out.obj
+        $(KPACK) a.out.obj
         mv a.out.obj $(LIBC.OBJ)
 test:

/contrib/kolibri-libc/source/Makefile.shared
1,3 → 1,3
all:
$(MAKE) clean
env CC=kos32-gcc CPP=kos32-cpp AS=kos32-as $(MAKE) shared
env CC=i686-w64-mingw32-gcc CPP=i686-w64-mingw32-cpp AS=i686-w64-mingw32-as $(MAKE) shared

 /contrib/kolibri-libc/source/exports/exports.c
 ,6 → 5,7
 #include <time.h>
 #include <sys/dirent.h>
 #include <ksys.h>
+#include <shell_api.h>
 ksys_coff_etable_t EXPORTS[] = {
     {"abs", abs},
 ,6 → 54,7
     {"getchar", getchar},
     {"gets", gets},
     {"hypot", hypot},
+    {"itoa", itoa},
     {"labs", labs},
     {"ldexp", ldexp},
     {"ldiv", ldiv},
 ,6 → 86,13
     {"rewind", rewind},
     {"rewinddir", rewinddir},
     {"seekdir", seekdir},
+    {"shell_printf", shell_printf},
+    {"shell_puts", shell_puts},
+    {"shell_putc", shell_putc},
+    {"shell_getc", shell_getc},
+    {"shell_gets", shell_gets},
+    {"shell_cls", shell_cls},
+    {"shell_exit", shell_exit},
     {"setbuf", setbuf},
     {"setvbuf", setvbuf},
     {"sin", sin},

/contrib/kolibri-libc/source/include/shell_api.h
3,6 → 3,7

#include <stddef.h>

extern void _FUNC(shell_printf)(const char* format, ...);
extern void _FUNC(shell_puts)(const char *s);
extern void _FUNC(shell_putc)(char c);
extern char _FUNC(shell_getc)();

 /contrib/kolibri-libc/source/shell_api/shell.h
 ,11 → 9,12
 #define SHELL_GETS              5
 #define SHELL_CLS               6
+#define SHELL_SHM_MAX  1024*16
 extern char __shell_shm_name[32];
 extern char *__shell_shm;
 extern int __shell_is_init;
 extern int __shell_init();
-extern void __shell_wait();
 #define SHELL_WAIT() while (*__shell_shm) _ksys_delay(5)

 /contrib/kolibri-libc/source/shell_api/shell_init.c
 ,6 → 1,7
 #include <ksys.h>
 #include <string.h>
 #include <stdlib.h>
+#include "shell.h"
 char __shell_shm_name[32];
 char*__shell_shm=NULL;
 ,7 → 22,7
     itoa(PID, __shell_shm_name);
     strcat(__shell_shm_name, "-SHELL");
-    return _ksys_shm_open(__shell_shm_name,  KSYS_SHM_OPEN_ALWAYS | KSYS_SHM_WRITE, 1024*16, &__shell_shm);
+    return _ksys_shm_open(__shell_shm_name,  KSYS_SHM_OPEN_ALWAYS | KSYS_SHM_WRITE, SHELL_SHM_MAX, &__shell_shm);
 }
 int __shell_init()

 /contrib/kolibri-libc/source/shell_api/shell_printf.c
 ,0 → 1,12
+#include "shell.h"
+#include <stdio.h>
+void shell_printf(const char *format,...)
+{
+    va_list ap;
+    va_start (ap, format);
+    *__shell_shm=SHELL_PUTS;
+    vsnprintf(__shell_shm+1, SHELL_SHM_MAX, format, ap);
+    va_end(ap);
+    SHELL_WAIT();
+}

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8631 → Rev 8632