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

File:

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

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

@@ -52 +52 @@
 #define CAT_VERSION "0.0.1"
 #define CAT_DEFAULT_BUFLEN 1024
-#define CAT_FULL_FILE 0
-
+
+static const char *cat_oops = "That option is not yet supported\n";
 static const char *hexchars = "0123456789abcdef";
 
@@ -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);
@@ -166 +163 @@
 }
 
-static unsigned int cat_file(const char *fname, size_t blen, bool hex,
-    off64_t head, off64_t tail, bool tail_first)
+static unsigned int cat_file(const char *fname, size_t blen, bool hex)
 {
         int fd, bytes = 0, count = 0, reads = 0;
         char *buff = NULL;
         int i;
-        size_t offset = 0, copied_bytes = 0;
-        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);
-        }
+        size_t offset = 0;
+
+        fd = open(fname, O_RDONLY);
         if (fd < 0) {
                 printf("Unable to open %s\n", fname);
@@ -196 +183 @@
         }
 
-        if (tail != CAT_FULL_FILE) {
-                file_size = lseek(fd, 0, SEEK_END);
-                if (head == CAT_FULL_FILE) {
-                        head = file_size;
-                        length = tail;
-                } else if (tail_first) {
-                        length = head;
-                } else {
-                        if (tail > head)
-                                tail = head;
-                        length = tail;
-                }
-
-                if (tail_first) {
-                        lseek(fd, (tail >= file_size) ? 0 : (file_size - tail), SEEK_SET);
-                } else {
-                        lseek(fd, ((head - tail) >= file_size) ? 0 : (head - tail), SEEK_SET);
-                }
-        } else
-                length = head;
-
         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 += copied_bytes;
-                copied_bytes = 0;
-
+                bytes = read(fd, buff, blen);
                 if (bytes > 0) {
+                        count += bytes;
                         buff[bytes] = '\0';
                         offset = 0;
@@ -240 +193 @@
                                         paged_char(hexchars[((uint8_t)buff[i])/16]);
                                         paged_char(hexchars[((uint8_t)buff[i])%16]);
-                                        paged_char(((count+i+1) & 0xf) == 0 ? '\n' : ' ');
                                 }
                                 else {
@@ -247 +199 @@
                                                 /* Reached end of string */
                                                 break;
-                                        } else if (c == U_SPECIAL && offset + 2 >= (size_t)bytes) {
-                                                /* If an extended character is cut off due to the size of the buffer,
-                                                   we will copy it over to the next buffer so it can be read correctly. */
-                                                copied_bytes = bytes - offset + 1;
-                                                memcpy(buff, buff + offset - 1, copied_bytes);
-                                                break;
                                         }
                                         paged_char(c);
@@ -258 +204 @@
                                 
                         }
-                        count += bytes;
                         reads++;
                 }
-
-                if (reading_stdin) {
-                        fflush(stdout);
-                }
-        } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
+        } while (bytes > 0 && !should_quit);
 
         close(fd);
@@ -282 +223 @@
 int cmd_cat(char **argv)
 {
-        unsigned int argc, i, ret = 0;
-        size_t buffer = 0;
+        unsigned int argc, i, ret = 0, buffer = 0;
         int c, opt_ind;
-        aoff64_t head = CAT_FULL_FILE, tail = CAT_FULL_FILE;
         bool hex = false;
         bool more = false;
-        bool tailFirst = false;
         sysarg_t rows, cols;
         int rc;
@@ -307 +245 @@
 
         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':
@@ -316 +254 @@
                         return CMD_SUCCESS;
                 case 'H':
-                        if (!optarg || str_uint64_t(optarg, NULL, 10, false, &head) != EOK ) {
-                                puts("Invalid head size\n");
-                                return CMD_FAILURE;
-                        }
-                        break;
+                        printf("%s", cat_oops);
+                        return CMD_FAILURE;
                 case 't':
-                        if (!optarg || str_uint64_t(optarg, NULL, 10, false, &tail) != EOK ) {
-                                puts("Invalid tail size\n");
-                                return CMD_FAILURE;
-                        }
-                        if (head == CAT_FULL_FILE)
-                                tailFirst = true;
-                        break;
+                        printf("%s", cat_oops);
+                        return CMD_FAILURE;
                 case 'b':
-                        if (!optarg || str_size_t(optarg, NULL, 10, false, &buffer) != EOK ) {
-                                puts("Invalid buffer size\n");
-                                return CMD_FAILURE;
-                        }
+                        printf("%s", cat_oops);
                         break;
                 case 'm':
@@ -341 +268 @@
                         hex = true;
                         break;
-                case 's':
-                        dash_represents_stdin = true;
-                        break;
                 }
         }
@@ -355 +279 @@
         }
 
-        if (buffer < 4)
+        if (buffer <= 0)
                 buffer = CAT_DEFAULT_BUFLEN;
         
@@ -371 +295 @@
 
         for (i = optind; argv[i] != NULL && !should_quit; i++)
-                ret += cat_file(argv[i], buffer, hex, head, tail, tailFirst);
+                ret += cat_file(argv[i], buffer, hex);
 
         if (ret)