Changes in uspace/app/bdsh/cmds/modules/cat/cat.c [07b7c48:cc9f314] in mainline

File:

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

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

@@ -62 +62 @@
 static sysarg_t console_rows = 0;
 static bool should_quit = false;
-static bool dash_represents_stdin = false;
 
 static console_ctrl_t *console = NULL;
@@ -74 +73 @@
         { "more", no_argument, 0, 'm' },
         { "hex", no_argument, 0, 'x' },
-        { "stdin", no_argument, 0, 's' },
         { 0, 0, 0, 0 }
 };
@@ -95 +93 @@
                 "  -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"
                 "Currently, %s is under development, some options don't work.\n",
                 cmdname, cmdname);
@@ -117 +114 @@
 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;
                         }
@@ -178 +172 @@
         off64_t file_size = 0, length = 0;
 
-        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
-                fd = open(fname, O_RDONLY);
-        
+        fd = open(fname, O_RDONLY);
         if (fd < 0) {
                 printf("Unable to open %s\n", fname);
@@ -221 +207 @@
 
         do {
-                size_t bytes_to_read;
-                if (reading_stdin) {
-                        bytes_to_read = 1;
-                } else {
-                        if ((length != CAT_FULL_FILE) &&
-                            (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) {
-                                bytes_to_read = (size_t) (length - count);
-                        } else {
-                                bytes_to_read = blen - copied_bytes;
-                        }
-                }
-                
-                bytes = read(fd, buff + copied_bytes, bytes_to_read);
+                bytes = read(fd, buff + copied_bytes, (
+                        (length != CAT_FULL_FILE && length - (off64_t)count <= (off64_t)(blen - copied_bytes)) ?
+                        (size_t)(length - count) :
+                        (blen - copied_bytes) ) );
                 bytes += copied_bytes;
                 copied_bytes = 0;
@@ -265 +242 @@
                         reads++;
                 }
-                
-                if (reading_stdin)
-                        fflush(stdout);
         } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
 
@@ -310 +284 @@
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "xhvmH:t:b:s", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "xhvmH:t:b:", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
@@ -344 +318 @@
                         hex = true;
                         break;
-                case 's':
-                        dash_represents_stdin = true;
-                        break;
                 }
         }