Changes in uspace/app/bdsh/cmds/modules/cat/cat.c [0845589:a33706e] in mainline

File:

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

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

@@ -63 +63 @@
 static bool should_quit = false;
 static bool dash_represents_stdin = false;
-static unsigned int lineno = 0;
-static bool number = false;
-static bool last_char_was_newline = false;
 
 static console_ctrl_t *console = NULL;
@@ -78 +75 @@
         { "hex", no_argument, 0, 'x' },
         { "stdin", no_argument, 0, 's' },
-        { "number", no_argument, 0, 'n' },
         { 0, 0, 0, 0 }
 };
@@ -99 +95 @@
                 "  -m, --more       Pause after each screen full\n"
                 "  -x, --hex        Print bytes as hex values\n"
-                "  -s, --stdin      Treat `-' in file list as standard input\n"
-                "  -n, --number     Number all output lines\n"
+                "  -s  --stdin      Treat `-' in file list as standard input\n"
                 "Currently, %s is under development, some options don't work.\n",
                 cmdname, cmdname);
@@ -122 +117 @@
 static void waitkey()
 {
-        cons_event_t ev;
-        kbd_event_t *kev;
+        kbd_event_t ev;
         
         while (true) {
-                if (!console_get_event(console, &ev)) {
+                if (!console_get_kbd_event(console, &ev)) {
                         return;
                 }
-                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
-                        kev = &ev.ev.key;
-                        
-                        if (kev->key == KC_ESCAPE || kev->key == KC_Q) {
+                if (ev.type == KEY_PRESS) {
+                        if (ev.key == KC_ESCAPE || ev.key == KC_Q) {
                                 should_quit = true;
                                 return;
                         }
-                        if (kev->key == KC_C) {
+                        if (ev.key == KC_C) {
                                 paging_enabled = false;
                                 return;
                         }
-                        if (kev->key == KC_ENTER || kev->key == KC_SPACE ||
-                            kev->key == KC_PAGE_DOWN) {
+                        if (ev.key == KC_ENTER || ev.key == KC_SPACE ||
+                            ev.key == KC_PAGE_DOWN) {
                                 return;
                         }
@@ -158 +150 @@
 static void paged_char(wchar_t c)
 {
-        if (last_char_was_newline && number) {
-                lineno++;
-                printf("%6u  ", lineno);
-        }
         putchar(c);
-        last_char_was_newline = c == '\n';
         if (paging_enabled) {
                 chars_remaining--;
@@ -189 +176 @@
 
         bool reading_stdin = dash_represents_stdin && (str_cmp(fname, "-") == 0);
-        
+
         if (reading_stdin) {
                 fd = fileno(stdin);
                 /* Allow storing the whole UTF-8 character. */
                 blen = STR_BOUNDS(1);
-        } else
+        } else {
                 fd = open(fname, O_RDONLY);
-        
+        }
         if (fd < 0) {
                 printf("Unable to open %s\n", fname);
@@ -235 +222 @@
                         bytes_to_read = 1;
                 } else {
-                        if ((length != CAT_FULL_FILE) &&
-                            (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) {
+                        if ((length != CAT_FULL_FILE)
+                            && (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) {
                                 bytes_to_read = (size_t) (length - count);
                         } else {
@@ -242 +229 @@
                         }
                 }
-                
                 bytes = read(fd, buff + copied_bytes, bytes_to_read);
                 bytes += copied_bytes;
@@ -275 +261 @@
                         reads++;
                 }
-                
-                if (reading_stdin)
+
+                if (reading_stdin) {
                         fflush(stdout);
+                }
         } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
 
@@ -316 +303 @@
         should_quit = false;
         console = console_init(stdin, stdout);
-        number = false;
-        lineno = 0;
-        /* This enables printing of the first number. */
-        last_char_was_newline = true;
-
 
         argc = cli_count_args(argv);
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "xhvmH:t:b:s:n", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "xhvmH:t:b:s", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
@@ -362 +344 @@
                         dash_represents_stdin = true;
                         break;
-                case 'n':
-                        number = true;
-                        break;
                 }
         }