5 files changed, 50 insertions, 8 deletions

diff --git a/usr.bin/kstat/kstat.c b/usr.bin/kstat/kstat.c
index 853bc8b..e3b7e6a 100644
--- a/usr.bin/kstat/kstat.c
+++ b/usr.bin/kstat/kstat.c
@@ -37,6 +37,8 @@ get_sched_stat(void)
 {
     struct sched_stat stat;
     struct sched_cpu *cpu;
+    double nonline, noffline;
+    uint16_t online_percent;
     int fd;
 
     fd = open("/ctl/sched/stat", O_RDONLY);
@@ -50,10 +52,15 @@ get_sched_stat(void)
     }
 
     close(fd);
+    noffline = stat.nhlt;
+    nonline = (stat.ncpu - noffline);
+    online_percent = (uint16_t)(((double)nonline / (nonline + noffline)) * 100);
+
     printf("-------------------------------\n");
     printf("Number of tasks: %d\n", stat.nproc);
     printf("Number of cores online: %d\n", stat.ncpu);
     printf("Scheduler quantum: %d usec\n", stat.quantum_usec);
+    printf("CPU is %d%% online\n", online_percent);
     printf("-------------------------------\n");
 
     /*
diff --git a/usr.bin/oasm/emit.c b/usr.bin/oasm/emit.c
index 139cf47..6b17eab 100644
--- a/usr.bin/oasm/emit.c
+++ b/usr.bin/oasm/emit.c
@@ -471,7 +471,7 @@ emit_process(struct oasm_state *oasm, struct emit_state *emit)
             curtok = emit_encode_hlt(emit, curtok);
             break;
         default:
-            if (lex_is_mro(curtok->type)) {
+            if (tok_is_mro(curtok->type)) {
                 curtok = emit_encode_mro(emit, curtok);
                 break;
             }
diff --git a/usr.bin/oasm/include/oasm/lex.h b/usr.bin/oasm/include/oasm/lex.h
index 375771e..873f6b9 100644
--- a/usr.bin/oasm/include/oasm/lex.h
+++ b/usr.bin/oasm/include/oasm/lex.h
@@ -167,7 +167,7 @@ tok_is_xreg(tt_t tok)
  * instruction. Returns true on match.
  */
 __always_inline static inline bool
-lex_is_mro(tt_t tok)
+tok_is_mro(tt_t tok)
 {
     switch (tok) {
     case TT_MROB:
diff --git a/usr.bin/oasm/parse.c b/usr.bin/oasm/parse.c
index ba97306..c81b498 100644
--- a/usr.bin/oasm/parse.c
+++ b/usr.bin/oasm/parse.c
@@ -127,13 +127,12 @@ parse_reg(struct oasm_state *state, struct oasm_token *tok)
         state->last = tok->type;
         break;
     default:
-        if (lex_is_mro(state->last)) {
-            state->last = tok->type;
+        if (tok_is_mro(state->last)) {
             break;
         }
 
         p = tokstr[state->last];
-        oasm_err("bad instruction '%s' for regop\n", p);
+        oasm_err("bad token '%s' for regop\n", p);
         return -1;
     }
 
@@ -205,7 +204,7 @@ parse_tok(struct oasm_state *state, struct oasm_token *tok)
         emit_osmx64(&emit_state, tok);
         break;
     default:
-        if (lex_is_mro(tok->type)) {
+        if (tok_is_mro(tok->type)) {
             state->last = tok->type;
             emit_osmx64(&emit_state, tok);
             return 0;
diff --git a/usr.bin/osh/osh.c b/usr.bin/osh/osh.c
index af7f4ab..545f95a 100644
--- a/usr.bin/osh/osh.c
+++ b/usr.bin/osh/osh.c
@@ -43,6 +43,9 @@
 #define is_printable(C) ((C) >= 32 && (C) <= 126)
 #define is_ascii(C) ((C) >= 0 && (C) <= 128)
 
+#define INPUT_SIZE 64
+
+#define REPEAT  "!!"
 #define COMMENT '@'
 #define WELCOME \
     ":::::::::::::::::::::::::::::::::::::::\n" \
@@ -66,7 +69,8 @@
 
 #define PROMPT "[%s::osmora]~ "
 
-static char buf[64];
+static char last_command[INPUT_SIZE];
+static char buf[INPUT_SIZE];
 static int running;
 static int bell_fd;
 static bool bs_bell = true; /* Beep on backspace */
@@ -365,6 +369,18 @@ parse_line(char *input)
     struct parse_state state = {0};
     pid_t child;
 
+    /*
+     * If we are using the REPEAT shorthand,
+     * repeat the last command. We return -EAGAIN
+     * to indicate we did not parse a normal command
+     * so the repeat command isn't pushed into the last
+     * command buffer and we enter a recursive hell.
+     */
+    if (strcmp(input, REPEAT) == 0) {
+        parse_line(last_command);
+        return -EAGAIN;
+    }
+
     /* Ensure the aux vector is zeored */
     memset(argv, 0, sizeof(argv));
 
@@ -426,6 +442,25 @@ open_script(const char *pathname)
     return 0;
 }
 
+static void
+dump_file(const char *pathname)
+{
+    FILE *file;
+    char buf[64];
+    int fd;
+
+    file = fopen(pathname, "r");
+    if (file == NULL) {
+        return;
+    }
+
+    while (fgets(buf, sizeof(buf), file) != NULL) {
+        printf("%s", buf);
+    }
+
+    fclose(file);
+}
+
 int
 main(int argc, char **argv)
 {
@@ -442,7 +477,7 @@ main(int argc, char **argv)
 
     running = 1;
     bell_fd = open("/dev/beep", O_WRONLY);
-    puts(WELCOME);
+    dump_file("/etc/motd");
 
     while (running) {
         printf(PROMPT, getlogin());
@@ -457,6 +492,7 @@ main(int argc, char **argv)
             continue;
         }
 
+        memcpy(last_command, buf, buf_i + 1);
         buf[0] = '\0';
     }
     return 0;