Changeset ac897e8 in mainline

Timestamp:

2011-03-22T20:43:01Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

f2d665b4

Parents:

e7ffdd3

Message:

Fix paging for non-hex mode (i.e. when input may contain newlines)

File:

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

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

@@ -57 +57 @@
 static const char *hexchars = "0123456789abcdef";
 
-static size_t chars_per_screen = 0;
+static bool paging_enabled = false;
 static size_t chars_remaining = 0;
+static size_t lines_remaining = 0;
+static sysarg_t console_cols = 0;
+static sysarg_t console_rows = 0;
 
 static struct option const long_options[] = {
@@ -97 +100 @@
 static void waitprompt()
 {
-        sysarg_t rows, cols;
-        if (console_get_size(fphone(stdout), &cols, &rows) == EOK) {
-                console_set_pos(fphone(stdout), 0, rows-1);
-        }
+        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");
@@ -125 +125 @@
 {
         console_clear(fphone(stdout));
-        chars_remaining = chars_per_screen;
+        chars_remaining = console_cols;
+        lines_remaining = console_rows-1;
 }
 
@@ -131 +132 @@
 {
         putchar(c);
-        if (chars_per_screen > 0) {
+        if (paging_enabled) {
                 chars_remaining--;
-                if (chars_remaining == 0) {
+                if (c == '\n' || chars_remaining == 0) {
+                        chars_remaining = console_cols;
+                        lines_remaining--;
+                }
+                if (lines_remaining == 0) {
                         fflush(stdout);
                         waitprompt();
@@ -259 +264 @@
                         return CMD_FAILURE;
                 }
-                chars_per_screen = cols * (rows-1);
+                console_cols = cols;
+                console_rows = rows;
+                paging_enabled = true;
                 newpage();
         }