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

Timestamp:

2013-08-04T12:01:10Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea50906

Parents:

b08879c2 (diff), d856110 (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) (6 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;
@@ -75 +78 @@
         { "hex", no_argument, 0, 'x' },
         { "stdin", no_argument, 0, 's' },
+        { "number", no_argument, 0, 'n' },
         { 0, 0, 0, 0 }
 };
@@ -95 +99 @@
                 "  -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"
+                "  -s, --stdin      Treat `-' in file list as standard input\n"
+                "  -n, --number     Number all output lines\n"
                 "Currently, %s is under development, some options don't work.\n",
                 cmdname, cmdname);
@@ -153 +158 @@
 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--;
@@ -306 +316 @@
         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", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "xhvmH:t:b:s:n", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
@@ -347 +362 @@
                         dash_represents_stdin = true;
                         break;
+                case 'n':
+                        number = true;
+                        break;
                 }
         }