tb finally works

ulib/string/string.c

@@ -135,15 +135,21 @@ int string_strncmp( const char * s1, const char * s2, size_t n )
 #define STRING_TOKENIZEALLOC_TOK_SIZE 0xff
 
 char *string_tokenizealloc(char *s, char *delim) {
-  static int curridx = 0;
+  static char *saved = NULL;
-  if (!s || !delim || !s[curridx]) {
+
+  if (s) {
+    saved = s;
+  }
+
+  if (!delim || !saved) {
     return NULL;
   }
 
-  while (s[curridx] && string_strchr(delim, s[curridx])) {
+  while (*saved && string_strchr(delim, *saved)) {
-    curridx++;
+    saved++;
   }
-  if (!s[curridx]) {
+
+  if (!*saved) {
     return NULL;
   }
 
@@ -151,17 +157,17 @@ char *string_tokenizealloc(char *s, char *delim) {
   string_memset(w, 0, sizeof(char) * STRING_TOKENIZEALLOC_TOK_SIZE);
 
   int k = 0;
-  while (s[curridx] && !string_strchr(delim, s[curridx])) {
+  while (*saved && !string_strchr(delim, *saved)) {
     if (k >= STRING_TOKENIZEALLOC_TOK_SIZE - 1) {
       break;
     }
-    w[k++] = s[curridx++];
+    w[k++] = *saved++;
   }
 
   w[k] = '\0';
 
-  if (s[curridx]) {
+  if (*saved) {
-    curridx++;
+    saved++;
   }
 
   return w;

user/tb/interp.c

@@ -78,19 +78,19 @@ void tz_classify(Tokenizer *tz) {
 void tz_expandspecial(Tokenizer *tz) {
   Token *tk, *tktmp;
   LL_FOREACH_SAFE(tz->tokens, tk, tktmp) {
-    /* if (tk->ptr[0] == '$' && tk->len > 1) { */
+    if (tk->str[0] == '$' && string_len(tk->str) > 1) {
-    /*   char aliasbuf[RTALIAS_NAMEBUF_MAX]; */
+      RtAlias *alias, *aliastmp;
-    /*   string_memset(aliasbuf, 0, sizeof(aliasbuf)); */
+      LL_FOREACH_SAFE(RTALIASES, alias, aliastmp) {
-    /*   string_memcpy(aliasbuf, &tk->ptr[1], MIN(tk->len - 1, RTALIAS_NAMEBUF_MAX)); */
+        if (string_strcmp(alias->namebuf, tk->str) == 0) {
-    /*   RtAlias *alias, *aliastmp; */
+          ufree(tk->str);
-    /*   LL_FOREACH_SAFE(RTALIASES, alias, aliastmp) { */
+          size_t len = string_len(alias->valbuf)+1;
-    /*     if (string_strcmp(alias->namebuf, aliasbuf) == 0) { */
+          tk->str = umalloc(len);
-    /*       tk->ptr = alias->valbuf; */
+          string_memset(tk->str, 0, len);
-    /*       tk->len = string_len(alias->valbuf); */
+          string_memcpy(tk->str, alias->valbuf, string_len(alias->valbuf));
-    /*       break; */
+          break;
-    /*     } */
+        }
-    /*   } */
+      }
-    /* } */
+    }
   }
 }
 
@@ -125,7 +125,43 @@ bool interp_runstring(char *string, InterpResult **res, bool logcmds, bool inter
         goto next;
       }
     } else if (cmdtk->type == TOK_MISC) {
+      size_t argslen1;
+      Token *argtk, *argtktmp;
+      LL_FOREACH_SAFE_IDX(cmdtk->next, argtk, argtktmp, argslen1);
       
+      size_t i;
+      char **args1 = (char **)umalloc(sizeof(char *) * argslen1);
+      LL_FOREACH_SAFE_IDX(cmdtk->next, argtk, argtktmp, i) {
+        args1[i] = (char *)umalloc(PROC_ARG_MAX);
+        string_memset(args1[i], 0, PROC_ARG_MAX);
+        string_memcpy(args1[i], argtk->str, MIN(string_len(argtk->str), PROC_ARG_MAX));
+      }
+
+      int32_t app = processctl(-1, PCTL_SPAWN, (uint64_t)cmdtk->str, (uint64_t)args1, argslen1);
+      if (app < 0) {
+        usprintf(RES.errmsg, "Could not run %s: %s\n", cmdtk->str, ERRSTRING(app));
+        ok = false;
+        goto cleanup;
+      }
+
+      processctl(app, PCTL_RUN, 0, 0, 0);
+
+      uint8_t b;
+      while(processctl(app, PCTL_POLLSTATE, 0, 0, 0) != 4) {
+        if (interactive) {
+          int32_t nrd = ipcpipe(PID, IPCPIPE_IN, IPCPIPE_READ, &b, 1);
+          if (nrd > 0 && b == C('S')) {
+            processctl(app, PCTL_KILL, 0, 0, 0);
+            goto cleanup;
+          }
+        }
+        schedrelease();
+      }
+
+      cleanup: {
+        for (size_t j = 0; j < argslen1; j++) ufree(args1[j]);
+        ufree(args1);
+      }
     }
 
 next:
@@ -134,137 +170,6 @@ next:
     line = string_tokenizealloc(NULL, "\n");
   }
 
-#if 0
-  char line[LINE_MAX];
-  size_t pos = 0;
-  while (string[pos] != '\0') {
-    string_memset(line, 0, sizeof(line));
-    size_t next = inter_readline(string, pos, line, sizeof(line));
-    if (next == pos) {
-      break;
-    }
-
-    if (logcmds) {
-      uprintf("+%s\n", line);
-    }
-
-    /* Tokenizer tz; ZERO(&tz); */
-    /* tz_init(&tz, line, string_len(line)); */
-
-    /* Token tktmp; ZERO(&tktmp); */
-    /* while (tz_next(&tz, &tktmp)) { */
-    /*   Token *tk = dlmalloc(sizeof(*tk)); */
-    /*   tk->ptr = tktmp.ptr; */
-    /*   tk->len = tktmp.len; */
-    /*   tk->next = NULL; */
-    /*   LL_APPEND(tz.tokens, tk); */
-    /* } */
-    
-    /* tz_classify(&tz); */
-    /* tz_expandspecial(&tz); */
-
-    /* Token *cmdtk = tz.tokens; */
-    /* if (cmdtk->type == TOK_CMD) { */
-    /*   ok = cmdtk->cmd->fn(cmdtk->next); */
-    /*   if (!ok) { */
-    /*     usprintf(RES.errmsg, "cmd %.*s failed", (int)cmdtk->len, cmdtk->ptr); */
-    /*     tz_free(&tz); */
-    /*     goto done; */
-    /*   } */
-    /* } else if (cmdtk->type == TOK_MISC) { */
-    
-    /* } */
-   
-    /* nextline: { */
-    /*   tz_free(&tz); */
-      pos = next;
-    /* } */
-  }
-
-  /* char *bg = NULL, *end = NULL; */
-  /* interp_readline((char *)string, NULL, NULL); */
-  /* while (interp_readline(NULL, &bg, &end)) { */
-    /* size_t linelen = (size_t)(end - bg); */
-
-    /* if (logcmds) { */
-    /*   uprintf("+ %.*s\n", (int)linelen, bg); */
-    /* } */
-
-    /* Tokenizer tz = {0}; */
-    /* tz_init(&tz, bg, linelen); */
-  
-    /* Token toktmp = {0}; */
-#if 0
-    while (tz_next(&tz, &toktmp)) {
-      Token *tok = dlmalloc(sizeof(*tok));
-      tok->ptr = toktmp.ptr;
-      tok->len = toktmp.len;
-      tok->next = NULL;
-      LL_APPEND(tz.tokens, tok);
-      string_memset(&toktmp, 0, sizeof(toktmp));
-    }
-  
-    tz_classify(&tz);
-    tz_expandspecial(&tz);
-
-    Token *cmdtk = tz.tokens;
-    if (cmdtk->type == TOK_CMD) {
-      /* ok = cmdtk->cmd->fn(cmdtk->next); */
-      /* if (!ok) { */
-      /*   usprintf(RES.errmsg, "cmd %.*s failed", (int)cmdtk->len, cmdtk->ptr); */
-      /*   tz_free(&tz); */
-      /*   goto done; */
-      /* } */
-    } else if (cmdtk->type == TOK_MISC) {
-      /* const int appname_max = 128; */
-      /* char *appname = dlmalloc(appname_max); */
-      /* string_memset(appname, 0, appname_max); */
-      /* string_memcpy(appname, cmdtk->ptr, MIN(cmdtk->len, appname_max)); */
-      /* usnprintf(appname, appname_max, "%.*s", (int)cmdtk->len, cmdtk->ptr); */
-
-      /* size_t argslen1; */
-      /* LL_FOREACH_SAFE_IDX(cmdtk->next, argtk, argtktmp, argslen1); */
-      
-      /* size_t i; */
-      /* char **args1 = (char **)dlmalloc(sizeof(char *) * argslen1); */
-      /* LL_FOREACH_SAFE_IDX(cmdtk->next, argtk, argtktmp, i) { */
-      /*   args1[i] = (char *)dlmalloc(PROC_ARG_MAX); */
-      /*   string_memset(args1[i], 0, PROC_ARG_MAX); */
-      /*   string_memcpy(args1[i], argtk->ptr, argtk->len); */
-      /* } */
-
-      /* int32_t app = processctl(-1, PCTL_SPAWN, (uint64_t)appname, (uint64_t)args1, argslen1); */
-      /* if (app < 0) { */
-      /*   usprintf(RES.errmsg, "Could not run %s: %s\n", appname, ERRSTRING(app)); */
-      /*   ok = false; */
-      /*   goto cleanup; */
-      /* } */
-
-      /* processctl(app, PCTL_RUN, 0, 0, 0); */
-
-      /* uint8_t b; */
-      /* while(processctl(app, PCTL_POLLSTATE, 0, 0, 0) != 4) { */
-      /*   if (interactive) { */
-      /*     int32_t nrd = ipcpipe(PID, IPCPIPE_IN, IPCPIPE_READ, &b, 1); */
-      /*     if (nrd > 0 && b == C('S')) { */
-      /*       processctl(app, PCTL_KILL, 0, 0, 0); */
-      /*       goto cleanup; */
-      /*     } */
-      /*   } */
-      /*   schedrelease(); */
-      /* } */
-
-      cleanup: {
-        /* for (size_t j = 0; j < argslen1; j++) dlfree(args1[j]); */
-        /* dlfree(args1); */
-        /* dlfree((void*)appname); */
-      }
-    }
-
-    tz_free(&tz);
-#endif
-  /* } */
-#endif
 done:
   return ok;
 }

user/tb/main.c

@@ -142,12 +142,12 @@ void main(void) {
   set_config();
 
   if (CONFIG.preloadpath != NULL) {
-    LOG(LOG_INF, "Preloading script: {s}\n", CONFIG.preloadpath);
+    LOG(LOG_INF, "Preloading script: %s\n", CONFIG.preloadpath);
     do_file(CONFIG.preloadpath);
   }
 
   if (CONFIG.mode == MODE_INTERACTIVE) {
-    /* do_mode_interactive(); */
+    do_mode_interactive();
   } else if (CONFIG.mode == MODE_RUNFILE) {
     if (CONFIG.filepath == NULL) {
       uprintf("No file provided\n");