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

Timestamp:

2012-05-24T14:24:15Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b4ca0a9c

Parents:

a58bc8b

Message:

Bdsh/cat can read from stdin as well

File:

• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (8 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;
@@ -73 +74 @@
         { "more", no_argument, 0, 'm' },
         { "hex", no_argument, 0, 'x' },
+        { "stdin", no_argument, 0, 's' },
         { 0, 0, 0, 0 }
 };
@@ -93 +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"
                 "Currently, %s is under development, some options don't work.\n",
                 cmdname, cmdname);
@@ -172 +175 @@
         off64_t file_size = 0, length = 0;
 
-        fd = open(fname, O_RDONLY);
+        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);
+        }
         if (fd < 0) {
                 printf("Unable to open %s\n", fname);
@@ -207 +218 @@
 
         do {
-                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) ) );
+                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 += copied_bytes;
                 copied_bytes = 0;
@@ -242 +261 @@
                         reads++;
                 }
+
+                if (reading_stdin) {
+                        fflush(stdout);
+                }
         } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
 
@@ -284 +307 @@
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "xhvmH:t:b:", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "xhvmH:t:b:s", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
@@ -318 +341 @@
                         hex = true;
                         break;
+                case 's':
+                        dash_represents_stdin = true;
+                        break;
                 }
         }