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

Timestamp:

2011-05-01T19:34:26Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

0e26444

Parents:

1ff896e (diff), 042fbe0 (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) (12 diffs)

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

@@ -39 +39 @@
 #include <io/color.h>
 #include <io/style.h>
+#include <io/keycode.h>
 #include <errno.h>
 #include <vfs/vfs.h>
@@ -62 +63 @@
 static sysarg_t console_cols = 0;
 static sysarg_t console_rows = 0;
+static bool should_quit = false;
 
 static struct option const long_options[] = {
@@ -102 +104 @@
         console_set_pos(fphone(stdout), 0, console_rows-1);
         console_set_color(fphone(stdout), COLOR_BLUE, COLOR_WHITE, 0);
-        printf("Press any key to continue");
+        printf("ENTER/SPACE/PAGE DOWN - next page, "
+               "ESC/Q - quit, C - continue unpaged");
         fflush(stdout);
         console_set_style(fphone(stdout), STYLE_NORMAL);
@@ -116 +119 @@
                 }
                 if (ev.type == KEY_PRESS) {
-                        return;
+                        if (ev.key == KC_ESCAPE || ev.key == KC_Q) {
+                                should_quit = true;
+                                return;
+                        }
+                        if (ev.key == KC_C) {
+                                paging_enabled = false;
+                                return;
+                        }
+                        if (ev.key == KC_ENTER || ev.key == KC_SPACE ||
+                            ev.key == KC_PAGE_DOWN) {
+                                return;
+                        }
                 }
         }
@@ -150 +164 @@
 {
         int fd, bytes = 0, count = 0, reads = 0;
-        off64_t total = 0;
         char *buff = NULL;
         int i;
@@ -160 +173 @@
                 return 1;
         }
-
-        total = lseek(fd, 0, SEEK_END);
-        lseek(fd, 0, SEEK_SET);
 
         if (NULL == (buff = (char *) malloc(blen + 1))) {
@@ -177 +187 @@
                         buff[bytes] = '\0';
                         offset = 0;
-                        for (i = 0; i < bytes; i++) {
+                        for (i = 0; i < bytes && !should_quit; i++) {
                                 if (hex) {
                                         paged_char(hexchars[((uint8_t)buff[i])/16]);
@@ -185 +195 @@
                                         wchar_t c = str_decode(buff, &offset, bytes);
                                         if (c == 0) {
-                                                // reached end of string
+                                                /* Reached end of string */
                                                 break;
                                         }
@@ -194 +204 @@
                         reads++;
                 }
-        } while (bytes > 0);
+        } while (bytes > 0 && !should_quit);
 
         close(fd);
@@ -218 +228 @@
         int rc;
         
-        // reset global state
-        // TODO: move to structure?
+        /*
+         * reset global state
+         * TODO: move to structure?
+         */
         paging_enabled = false;
         chars_remaining = 0;
@@ -225 +237 @@
         console_cols = 0;
         console_rows = 0;
+        should_quit = false;
 
         argc = cli_count_args(argv);
@@ -278 +291 @@
         }
 
-        for (i = optind; argv[i] != NULL; i++)
+        for (i = optind; argv[i] != NULL && !should_quit; i++)
                 ret += cat_file(argv[i], buffer, hex);