Parsing commandline arguments

kernel/syscall/processctl.c

@@ -61,9 +61,9 @@ int32_t SYSCALL5(sys_processctl, pid1, cmd1, arg1, arg2, arg3) {
       }
 
       size_t argslen = arg3;
-      char **args = (char **)arg2;
+      char *(*args)[] = (char *(*)[])arg2;
       for (size_t i = 0; i < argslen; i++) {
-        PROC_ARG(newproc, args[i]);
+        PROC_ARG(newproc, (*args)[i]);
       }
 
       proc_register(newproc);

ulib/Makefile

@@ -12,10 +12,12 @@ SRCFILES := $(call GRABSRC, \
 							printf \
 							dlmalloc \
 							sync \
+							args \
 						)
 
 CFLAGS += -isystem $(ROOT)/share -isystem $(ROOT)/ulib -isystem $(ROOT)/std/include \
-					-DPRINTF_INCLUDE_CONFIG_H=1 -DLACKS_STRING_H=1 -include $(ROOT)/ulib/string/string.h
+					-isystem $(ROOT)/ulib/std -DPRINTF_INCLUDE_CONFIG_H=1 \
+					-DULIB_FLOAT_SUPPORT=0
 
 ASFILES := $(call GET_ASFILES, $(SRCFILES))
 CFILES := $(call GET_CFILES, $(SRCFILES))

ulib/args.h

@@ -1,7 +0,0 @@
-#ifndef ULIB_ARGS_H_
-#define ULIB_ARGS_H_
-
-char **args(void);
-size_t argslen(void);
-
-#endif // ULIB_ARGS_H_

ulib/args/args.c

@@ -0,0 +1,32 @@
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <args/args.h>
+#include <string/conv.h>
+#include <string/string.h>
+#include <uprintf.h>
+
+int32_t parse_args(char **argv, size_t argc, Arg *defs) {
+  for (size_t i = 0; i < argc; i++) {
+    if (argv[i][0] == '-' && argv[i][1] != '\0') {
+      char *optname = argv[i];
+      size_t j = 0;
+      while (!defs[j].end) {
+        Arg *def = &defs[j];
+        if (string_strcmp(def->shortname, optname) == 0) {
+          if (i < argc - 1) {
+            switch (def->expected_value) {
+              case ARG_STRING:
+                *((char **)def->ptr) = argv[i+1];
+                break;
+            }
+            i++;
+          }
+        }
+        j++;
+      }
+    }
+  }
+
+  return ARGP_OK;
+}

ulib/args/args.h

@@ -0,0 +1,33 @@
+#ifndef ULIB_ARGS_H_
+#define ULIB_ARGS_H_
+
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+
+char **args(void);
+size_t argslen(void);
+
+typedef struct {
+  char *shortname;
+  enum { ARG_STRING } expected_value;
+  void *ptr;
+  bool end;
+} Arg;
+
+#define ARG(sn, ev, p) ((Arg){ \
+    .shortname = (sn), \
+    .expected_value = (ev), \
+    .ptr = (void *)(p), \
+    .end = false, \
+  })
+
+#define ARG_END() ((Arg){ .end = true, })
+
+enum {
+  ARGP_OK = 0,
+};
+
+int32_t parse_args(char **argv, size_t argc, Arg *defs);
+
+#endif // ULIB_ARGS_H_

ulib/log.h

@@ -0,0 +1,17 @@
+#ifndef ULIB_LOG_H_
+#define ULIB_LOG_H_
+
+#include <uprintf.h>
+
+enum {
+  LOG_ERR,
+  LOG_DBG,
+  LOG_INF,
+  LOG_WRN,
+};
+
+static const char *_LOG_STR[] = { "ERROR", "DEBUG", "INFO", "WARNING" };
+
+#define LOG(mode, fmt, ...) uprintf("%s: "fmt, _LOG_STR[(mode)], ##__VA_ARGS__);
+
+#endif // ULIB_LOG_H_

ulib/machine/limits.h

@@ -0,0 +1,25 @@
+#ifndef ULIB_MACHINE_LIMITS_H_
+#define ULIB_MACHINE_LIMITS_H_
+
+#define CHAR_BIT (8)
+#define SHORT_BIT (16)
+#define WCHAR_BIT (16)
+#define INT_BIT (32)
+#define LONG_LONG_BIT (64)
+#define SCHAR_MIN (-128)
+#define SCHAR_MAX (127)
+#define UCHAR_MAX (255)
+#define SHRT_MIN (-32768)
+#define SHRT_MAX (32767)
+#define USHRT_MAX (65535)
+#define INT_MIN (-2147483648)
+#define INT_MAX (2147483647)
+#define UINT_MAX (4294967295U)
+#define LONG_MAX (2147483647L)
+#define LONG_MIN (-2147483648L)
+#define ULONG_MAX (18446744073709551615UL)
+#define LLONG_MAX (9223372036854775807LL)
+#define LLONG_MIN (-9223372036854775808LL)
+#define ULLONG_MAX (18446744073709551615ULL)
+
+#endif // ULIB_MACHINE_LIMITS_H_

ulib/std/limits.h

@@ -0,0 +1,6 @@
+#ifndef ULIB_STD_LIMITS_H_
+#define ULIB_STD_LIMITS_H_
+
+#include <machine/limits.h>
+
+#endif // ULIB_STD_LIMITS_H_

ulib/std/stdlib.h

@@ -0,0 +1,17 @@
+#ifndef ULIB_STD_STDLIB_H_
+#define ULIB_STD_STDLIB_H_
+
+#include <uprintf.h>
+#include <string/conv.h>
+
+#define printf uprintf
+#define sprintf usprintf
+#define vsprintf uvsprintf
+#define snprintf usnprintf
+#define vsnprintf uvsnprintf
+#define vprintf uvprintf
+
+#define strtoul string_conv_strtoul
+#define strtol string_conv_strtol
+
+#endif // ULIB_STD_STDLIB_H_

ulib/std/string.h

@@ -0,0 +1,17 @@
+#ifndef ULIB_STD_STRING_H_
+#define ULIB_STD_STRING_H_
+
+#include <string/string.h>
+
+#define memset string_memset
+#define memcpy string_memcpy
+#define strlen string_len
+#define memcmp string_memcmp
+#define strcmp string_strcmp
+#define strcspn string_strcspn
+#define strspn string_strspn
+#define strcpy string_strcpy
+#define strchr string_strchr
+#define strncmp string_strncmp
+
+#endif // ULIB_STD_STRING_H_

ulib/string/char.h

@@ -0,0 +1,17 @@
+#ifndef ULIB_STRING_CHAR_H_
+#define ULIB_STRING_CHAR_H_
+
+#define string_chr_islower(c) ((c) >= 'a' && (c) <= 'z')
+#define string_chr_isupper(c) ((c) >= 'A' && (c) <= 'Z')
+#define string_chr_isalpha(c) (string_chr_islower((c)) || string_chr_isupper((c)))
+#define string_chr_isctl(c) (((c) >= 0 && (c) <= 0x1f) || (c) == 0x7f)
+#define string_chr_isdigit(c) ((c) >= '0' && (c) <= '9')
+#define string_chr_isalnum(c) (string_chr_isalpha((c)) || string_chr_isdigit((c)))
+#define string_chr_isprint(c) ((c) > 0x1f && (c) < 0x7f)
+#define string_chr_isspace(c) ((c) == ' ' || (c) == '\f' || (c) == '\t' || (c) == '\n' || (c) == '\r' || (c) == '\v')
+#define string_chr_tolower(c) (string_chr_isupper((c)) ? ((c) - 'A' + 'a') : (c))
+#define string_chr_toupper(c) (string_chr_islower((c)) ? ((c) - 'a' + 'A') : (c))
+#define string_chr_isascii(c) (!((c) < 0 || (c) > 0x7f))
+#define string_chr_isxdigit(c) (((c) >= '0' && (c) <= '9') || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
+
+#endif // ULIB_STRING_CHAR_H_

ulib/string/conv.c

@@ -0,0 +1,159 @@
+#include <stdint.h>
+#include <stddef.h>
+#include <machine/limits.h>
+#include <string/char.h>
+#include <uprintf.h>
+
+// https://android.googlesource.com/platform/bionic/+/ics-mr0/libc/stdlib/strtoul.c
+unsigned long string_conv_strtoul(const char *nptr, char **endptr, int base)
+{
+	const char *s;
+	unsigned long acc, cutoff;
+	int c;
+	int neg, any, cutlim;
+	/*
+	 * See strtol for comments as to the logic used.
+	 */
+	s = nptr;
+	do {
+		c = (unsigned char) *s++;
+	} while (string_chr_isspace(c));
+	if (c == '-') {
+		neg = 1;
+		c = *s++;
+	} else {
+		neg = 0;
+		if (c == '+')
+			c = *s++;
+	}
+	if ((base == 0 || base == 16) &&
+	    c == '0' && (*s == 'x' || *s == 'X')) {
+		c = s[1];
+		s += 2;
+		base = 16;
+	}
+	if (base == 0)
+		base = c == '0' ? 8 : 10;
+	cutoff = ULONG_MAX / (unsigned long)base;
+	cutlim = ULONG_MAX % (unsigned long)base;
+	for (acc = 0, any = 0;; c = (unsigned char) *s++) {
+		if (string_chr_isdigit(c))
+			c -= '0';
+		else if (string_chr_isalpha(c))
+			c -= string_chr_isupper(c) ? 'A' - 10 : 'a' - 10;
+		else
+			break;
+		if (c >= base)
+			break;
+		if (any < 0)
+			continue;
+		if (acc > cutoff || (acc == cutoff && c > cutlim)) {
+			any = -1;
+			acc = ULONG_MAX;
+		} else {
+			any = 1;
+			acc *= (unsigned long)base;
+			acc += c;
+		}
+	}
+	if (neg && any > 0)
+		acc = -acc;
+	if (endptr != 0)
+		*endptr = (char *) (any ? s - 1 : nptr);
+	return (acc);
+}
+
+// https://android.googlesource.com/platform/bionic/+/ics-mr0/libc/stdlib/strtol.c
+long string_conv_strtol(const char *nptr, char **endptr, int base)
+{
+	const char *s;
+	long acc, cutoff;
+	int c;
+	int neg, any, cutlim;
+	/*
+	 * Skip white space and pick up leading +/- sign if any.
+	 * If base is 0, allow 0x for hex and 0 for octal, else
+	 * assume decimal; if base is already 16, allow 0x.
+	 */
+	s = nptr;
+	do {
+		c = (unsigned char) *s++;
+	} while (string_chr_isspace(c));
+	if (c == '-') {
+		neg = 1;
+		c = *s++;
+	} else {
+		neg = 0;
+		if (c == '+')
+			c = *s++;
+	}
+	if ((base == 0 || base == 16) &&
+	    c == '0' && (*s == 'x' || *s == 'X')) {
+		c = s[1];
+		s += 2;
+		base = 16;
+	}
+	if (base == 0)
+		base = c == '0' ? 8 : 10;
+	/*
+	 * Compute the cutoff value between legal numbers and illegal
+	 * numbers.  That is the largest legal value, divided by the
+	 * base.  An input number that is greater than this value, if
+	 * followed by a legal input character, is too big.  One that
+	 * is equal to this value may be valid or not; the limit
+	 * between valid and invalid numbers is then based on the last
+	 * digit.  For instance, if the range for longs is
+	 * [-2147483648..2147483647] and the input base is 10,
+	 * cutoff will be set to 214748364 and cutlim to either
+	 * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
+	 * a value > 214748364, or equal but the next digit is > 7 (or 8),
+	 * the number is too big, and we will return a range error.
+	 *
+	 * Set any if any `digits' consumed; make it negative to indicate
+	 * overflow.
+	 */
+	cutoff = neg ? LONG_MIN : LONG_MAX;
+	cutlim = cutoff % base;
+	cutoff /= base;
+	if (neg) {
+		if (cutlim > 0) {
+			cutlim -= base;
+			cutoff += 1;
+		}
+		cutlim = -cutlim;
+	}
+	for (acc = 0, any = 0;; c = (unsigned char) *s++) {
+		if (string_chr_isdigit(c))
+			c -= '0';
+		else if (string_chr_isalpha(c))
+			c -= string_chr_isupper(c) ? 'A' - 10 : 'a' - 10;
+		else
+			break;
+		if (c >= base)
+			break;
+		if (any < 0)
+			continue;
+		if (neg) {
+			if (acc < cutoff || (acc == cutoff && c > cutlim)) {
+				any = -1;
+				acc = LONG_MIN;
+			} else {
+				any = 1;
+				acc *= base;
+				acc -= c;
+			}
+		} else {
+			if (acc > cutoff || (acc == cutoff && c > cutlim)) {
+				any = -1;
+				acc = LONG_MAX;
+			} else {
+				any = 1;
+				acc *= base;
+				acc += c;
+			}
+		}
+	}
+	if (endptr != 0)
+		*endptr = (char *) (any ? s - 1 : nptr);
+	return (acc);
+}

ulib/string/conv.h

@@ -0,0 +1,7 @@
+#ifndef ULIB_STRING_CONV_H_
+#define ULIB_STRING_CONV_H_
+
+unsigned long string_conv_strtoul(const char *nptr, char **endptr, int base);
+long string_conv_strtol(const char *nptr, char **endptr, int base);
+
+#endif // ULIB_STRING_CONV_H_

ulib/string/string.c

@@ -111,3 +111,22 @@ char *string_strchr(const char *s, int c) {
     }
     return NULL;
 }
+
+// https://stackoverflow.com/questions/32560167/strncmp-implementation
+int string_strncmp( const char * s1, const char * s2, size_t n )
+{
+    while ( n && *s1 && ( *s1 == *s2 ) )
+    {
+        ++s1;
+        ++s2;
+        --n;
+    }
+    if ( n == 0 )
+    {
+        return 0;
+    }
+    else
+    {
+        return ( *(unsigned char *)s1 - *(unsigned char *)s2 );
+    }
+}

ulib/string/string.h

@@ -6,9 +6,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#define memset string_memset
-#define memcpy string_memcpy
-
 size_t string_len(const char *s);
 void *string_memset(void *p, int c, size_t n);
 void *string_memcpy(void *dst, const void *src, size_t n);
@@ -18,6 +15,7 @@ size_t string_strcspn(const char *s, const char *reject);
 size_t string_strspn(const char *s, const char *accept);
 char *string_strcpy(char *dest, const char *src);
 char *string_strchr(const char *s, int c);
+int string_strncmp(const char * s1, const char * s2, size_t n);
 
 #endif
 

user/Makefile.inc

@@ -1,5 +1,6 @@
 CFLAGS := -ffreestanding -Wall -Wextra -g -fcommon -nostdinc \
-          -isystem $(ROOT)/std/include -isystem $(ROOT)/ulib -isystem $(ROOT)/share
+          -isystem $(ROOT)/std/include -isystem $(ROOT)/ulib -isystem $(ROOT)/share \
+          -isystem $(ROOT)/ulib/std
 
 CURRENT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 

user/init/main.c

@@ -1,60 +1,42 @@
 #include <stdint.h>
 #include <string/string.h>
 #include <system/system.h>
-#include <sysdefs/ioctl.h>
 #include <sysdefs/ipcpipe.h>
 #include <sysdefs/processctl.h>
 #include <uprintf.h>
 #include <ansiq/all.h>
+#include <string/char.h>
+
+void *string_memset2(void *p, int c, size_t n) {
+  char *cp = p;
+  for (size_t i = 0; i < n; i++) cp[i] = c;
+  return p;
+}
 
 void main(void) {
-  uprintf(ANSIQ_CUR_SET(0, 0));
+  char *tbargs[] = { "-m", "interactive" };
-  uprintf(ANSIQ_SCR_CLR_ALL);
+  int32_t tb = processctl(-1, PCTL_SPAWN, (uint64_t)"base:/bin/tb", (uint64_t)&tbargs, 2);
-
-  int32_t ioh = ioctl(IOCTL_NOHANDLE,
-                      IOCTL_OPENF,
-                      (uint64_t)"temp:/hello.txt",
-                      IOCTL_F_WRITE | IOCTL_F_READ | IOCTL_F_MAKE,
-                      0
-                    );
-  
-  char *text = "Hello from FS";
-  ioctl(ioh, IOCTL_WRITE, (uint64_t)text, string_len(text), 0);
-
-  char buf[0x100] = {0};
-  ioctl(ioh, IOCTL_READ, (uint64_t)buf, string_len(text), 0);
-
-  uprintf("file contents: %s\n", buf);
-
-  ioctl(ioh, IOCTL_CLOSEF, 0, 0, 0);
-
-  uprintf("Hello world using uprintf\n");
-
-  const char *tbargs[] = { "-i" };
-  int32_t tb = processctl(-1, PCTL_SPAWN, (uint64_t)"base:/bin/tb", (uint64_t)tbargs, 1);
   uint64_t selfpid = (uint64_t)processctl(-1, PCTL_GETPID, 0, 0, 0);
   ipcpipe(tb, IPCPIPE_OUT, IPCPIPE_REPLACE, (uint8_t *)selfpid, IPCPIPE_OUT);
   processctl(tb, PCTL_RUN, 0, 0, 0);
-  while(processctl(tb, PCTL_POLLSTATE, 0, 0, 0) != 2);
 
-  if (ipcpipe(IPCPIPE_SELFPID, 10, IPCPIPE_MAKE, NULL, 0) < 0) {
+  ipcpipe(IPCPIPE_SELFPID, 10, IPCPIPE_MAKE, NULL, 0);
-    uprintf("failed to create 10th pipe\n");
+  ipcpipe(IPCPIPE_SELFPID, 10, IPCPIPE_ADD_BCAST, NULL, 1);
-  }
 
-  int32_t r = ipcpipe(IPCPIPE_SELFPID, 10, IPCPIPE_ADD_BCAST, NULL, 1);
+  while(processctl(tb, PCTL_POLLSTATE, 0, 0, 0) != 2) {
-  uprintf("%d\n", r);
-
-  while(1) {
     int32_t kbchr;
     int32_t read = ipcpipe(IPCPIPE_SELFPID, 10, IPCPIPE_READ, (uint8_t *)&kbchr, sizeof(kbchr));
     if (read > 0) {
-      kbchr &= 0xFF;
+      uint8_t c = kbchr & 0xff;
-      if ((kbchr >= 0x20 && kbchr <= 0x7F) || kbchr == 0xA) {
+      if (string_chr_isascii(c)) {
-        uprintf("%c", kbchr & 0xFF);
+        if (c != 0) {
+          ipcpipe(tb, IPCPIPE_IN, IPCPIPE_WRITE, &c, 1);
+        }
+        if (string_chr_isprint(c)) {
+          uprintf("%c", c);
+        }
+      }
     }
   }
 }
 
-  for(;;);
-}
-

user/tb/main.c

@@ -1,12 +1,76 @@
+#include <stdint.h>
+#include <stddef.h>
 #include <uprintf.h>
-#include <dlmalloc/malloc.h>
+#include <args/args.h>
-#include <args.h>
+#include <string/string.h>
+#include <string/char.h>
+#include <log.h>
+#include <ansiq/all.h>
+#include <system/system.h>
+#include <sysdefs/ipcpipe.h>
+
+static struct {
+  char *modestr;
+  enum { MODE_INTERACTIVE = 1, MODE_RUNFILE = 2 } mode;
+} CONFIG;
+
+#define LINEBUF_MAX 1024
+
+static Arg ARGS[] = {
+  ARG("-m", ARG_STRING, &CONFIG.modestr),
+  ARG_END(),
+};
+
+void set_config(void) {
+  int32_t ret;
+  if ((ret = parse_args(args(), argslen(), ARGS)) < 0) {
+    uprintf("Could not parse args: %d\n", ret);
+  }
+
+  if (CONFIG.modestr != NULL) {
+    if (string_strcmp(CONFIG.modestr, "interactive") == 0) {
+      CONFIG.mode = MODE_INTERACTIVE;
+    } else if (string_strcmp(CONFIG.modestr, "runfile") == 0) {
+      CONFIG.mode = MODE_RUNFILE;
+    } else {
+      LOG(LOG_ERR, "Unknown mode %s\n", CONFIG.modestr);
+    }
+  } else {
+    CONFIG.mode = MODE_RUNFILE;
+  }
+  uprintf("CONFIG.mode = %d\n", CONFIG.mode);
+}
+
+void process_cmd(char *cmdtext) {
+
+}
+
+void do_mode_interactive(void) {
+  char linebuf[LINEBUF_MAX];
+  size_t cursor;
+  for(;;) {
+    uprintf("tb# ");
+
+    cursor = 0;
+    string_memset(linebuf, 0, LINEBUF_MAX);
+    char c = 0;
+    while (c != '\n') {
+      int32_t rd = ipcpipe(IPCPIPE_SELFPID, IPCPIPE_IN, IPCPIPE_READ, (uint8_t *)&c, 1);
+      if (rd > 0 && cursor < LINEBUF_MAX) {
+        linebuf[cursor++] = c;
+      }
+    }
+    linebuf[cursor - 1] = '\0';
+    uprintf("\n");
+
+    process_cmd(linebuf);
+  }
+}
 
 void main(void) {
-  uprintf("Hello from tb!\n");
+  set_config();
 
-  for (size_t i = 0; i < argslen(); i++) {
+  if (CONFIG.mode == MODE_INTERACTIVE) {
-    uprintf("i = %d\n", i);
+    do_mode_interactive();
-    uprintf("arg: %s\n", args()[i]);
   }
 }