Changeset d011038 in mainline for uspace/app/bdsh/cmds/modules/cat/cat.c

Timestamp:

2011-03-29T20:12:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8f17503

Parents:

c4fb95d3 (diff), 93ebe4e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (10 diffs)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -1 +1 @@
 /* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+ * Copyright (c) 2011, Martin Sucha
  * All rights reserved.
  *
@@ -35 +36 @@
 #include <str.h>
 #include <fcntl.h>
+#include <io/console.h>
+#include <io/color.h>
+#include <io/style.h>
+#include <io/keycode.h>
+#include <errno.h>
+#include <vfs/vfs.h>
+#include <assert.h>
 
 #include "config.h"
@@ -48 +56 @@
 
 static const char *cat_oops = "That option is not yet supported\n";
+static const char *hexchars = "0123456789abcdef";
+
+static bool paging_enabled = false;
+static size_t chars_remaining = 0;
+static size_t lines_remaining = 0;
+static sysarg_t console_cols = 0;
+static sysarg_t console_rows = 0;
+static bool should_quit = false;
 
 static struct option const long_options[] = {
@@ -56 +72 @@
         { "buffer", required_argument, 0, 'b' },
         { "more", no_argument, 0, 'm' },
+        { "hex", no_argument, 0, 'x' },
         { 0, 0, 0, 0 }
 };
@@ -75 +92 @@
                 "  -b, --buffer ##  Set the read buffer size to ##\n"
                 "  -m, --more       Pause after each screen full\n"
+                "  -x, --hex        Print bytes as hex values\n"
                 "Currently, %s is under development, some options don't work.\n",
                 cmdname, cmdname);
@@ -82 +100 @@
 }
 
-static unsigned int cat_file(const char *fname, size_t blen)
+static void waitprompt()
+{
+        console_set_pos(fphone(stdout), 0, console_rows-1);
+        console_set_color(fphone(stdout), COLOR_BLUE, COLOR_WHITE, 0);
+        printf("ENTER/SPACE/PAGE DOWN - next page, "
+               "ESC/Q - quit, C - continue unpaged");
+        fflush(stdout);
+        console_set_style(fphone(stdout), STYLE_NORMAL);
+}
+
+static void waitkey()
+{
+        console_event_t ev;
+        
+        while (true) {
+                if (!console_get_event(fphone(stdin), &ev)) {
+                        return;
+                }
+                if (ev.type == KEY_PRESS) {
+                        if (ev.key == KC_ESCAPE || ev.key == KC_Q) {
+                                should_quit = true;
+                                return;
+                        }
+                        if (ev.key == KC_C) {
+                                paging_enabled = false;
+                                return;
+                        }
+                        if (ev.key == KC_ENTER || ev.key == KC_SPACE ||
+                            ev.key == KC_PAGE_DOWN) {
+                                return;
+                        }
+                }
+        }
+        assert(false);
+}
+
+static void newpage()
+{
+        console_clear(fphone(stdout));
+        chars_remaining = console_cols;
+        lines_remaining = console_rows-1;
+}
+
+static void paged_char(wchar_t c)
+{
+        putchar(c);
+        if (paging_enabled) {
+                chars_remaining--;
+                if (c == '\n' || chars_remaining == 0) {
+                        chars_remaining = console_cols;
+                        lines_remaining--;
+                }
+                if (lines_remaining == 0) {
+                        fflush(stdout);
+                        waitprompt();
+                        waitkey();
+                        newpage();
+                }
+        }
+}
+
+static unsigned int cat_file(const char *fname, size_t blen, bool hex)
 {
         int fd, bytes = 0, count = 0, reads = 0;
         off64_t total = 0;
         char *buff = NULL;
+        int i;
+        size_t offset = 0;
 
         fd = open(fname, O_RDONLY);
@@ -109 +190 @@
                         count += bytes;
                         buff[bytes] = '\0';
-                        printf("%s", buff);
+                        offset = 0;
+                        for (i = 0; i < bytes && !should_quit; i++) {
+                                if (hex) {
+                                        paged_char(hexchars[((uint8_t)buff[i])/16]);
+                                        paged_char(hexchars[((uint8_t)buff[i])%16]);
+                                }
+                                else {
+                                        wchar_t c = str_decode(buff, &offset, bytes);
+                                        if (c == 0) {
+                                                // reached end of string
+                                                break;
+                                        }
+                                        paged_char(c);
+                                }
+                                
+                        }
                         reads++;
                 }
-        } while (bytes > 0);
+        } while (bytes > 0 && !should_quit);
 
         close(fd);
@@ -131 +227 @@
         unsigned int argc, i, ret = 0, buffer = 0;
         int c, opt_ind;
+        bool hex = false;
+        bool more = false;
+        sysarg_t rows, cols;
+        int rc;
+        
+        // reset global state
+        // TODO: move to structure?
+        paging_enabled = false;
+        chars_remaining = 0;
+        lines_remaining = 0;
+        console_cols = 0;
+        console_rows = 0;
+        should_quit = false;
 
         argc = cli_count_args(argv);
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "hvmH:t:b:", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "xhvmH:t:b:", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
@@ -144 +253 @@
                         return CMD_SUCCESS;
                 case 'H':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         return CMD_FAILURE;
                 case 't':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         return CMD_FAILURE;
                 case 'b':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         break;
                 case 'm':
-                        printf(cat_oops);
-                        return CMD_FAILURE;
+                        more = true;
+                        break;
+                case 'x':
+                        hex = true;
+                        break;
                 }
         }
@@ -168 +280 @@
         if (buffer <= 0)
                 buffer = CAT_DEFAULT_BUFLEN;
-
-        for (i = optind; argv[i] != NULL; i++)
-                ret += cat_file(argv[i], buffer);
+        
+        if (more) {
+                rc = console_get_size(fphone(stdout), &cols, &rows);
+                if (rc != EOK) {
+                        printf("%s - cannot get console size\n", cmdname);
+                        return CMD_FAILURE;
+                }
+                console_cols = cols;
+                console_rows = rows;
+                paging_enabled = true;
+                newpage();
+        }
+
+        for (i = optind; argv[i] != NULL && !should_quit; i++)
+                ret += cat_file(argv[i], buffer, hex);
 
         if (ret)