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

Timestamp:

2011-03-24T21:30:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

47f7adfc

Parents:

5ea37b1

git-author:

Martin Sucha <> (2011-03-24 21:30:41)

git-committer:

Jakub Jermar <jakub@…> (2011-03-24 21:30:41)

Message:

Improve paging options of 'cat'.

File:

• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (8 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;
+                        }
                 }
         }
@@ -177 +191 @@
                         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]);
@@ -194 +208 @@
                         reads++;
                 }
-        } while (bytes > 0);
+        } while (bytes > 0 && !should_quit);
 
         close(fd);
@@ -225 +239 @@
         console_cols = 0;
         console_rows = 0;
+        should_quit = false;
 
         argc = cli_count_args(argv);
@@ -278 +293 @@
         }
 
-        for (i = optind; argv[i] != NULL; i++)
+        for (i = optind; argv[i] != NULL && !should_quit; i++)
                 ret += cat_file(argv[i], buffer, hex);