1 files changed, 28 insertions, 5 deletions

diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c
index 0a69d2adc4f3..14ff4849262c 100644
--- a/kernel/debug/kdb/kdb_io.c
+++ b/kernel/debug/kdb/kdb_io.c
@@ -552,6 +552,7 @@ int vkdb_printf(const char *fmt, va_list ap)
 {
         int diag;
         int linecount;
+        int colcount;
         int logging, saved_loglevel = 0;
         int saved_trap_printk;
         int got_printf_lock = 0;
@@ -584,6 +585,10 @@ int vkdb_printf(const char *fmt, va_list ap)
         if (diag || linecount <= 1)
                 linecount = 24;
 
+        diag = kdbgetintenv("COLUMNS", &colcount);
+        if (diag || colcount <= 1)
+                colcount = 80;
+
         diag = kdbgetintenv("LOGGING", &logging);
         if (diag)
                 logging = 0;
@@ -690,7 +695,7 @@ kdb_printit:
                 gdbstub_msg_write(kdb_buffer, retlen);
         } else {
                 if (dbg_io_ops && !dbg_io_ops->is_console) {
-                        len = strlen(kdb_buffer);
+                        len = retlen;
                         cp = kdb_buffer;
                         while (len--) {
                                 dbg_io_ops->write_char(*cp);
@@ -709,11 +714,29 @@ kdb_printit:
                 printk(KERN_INFO "%s", kdb_buffer);
         }
 
-        if (KDB_STATE(PAGER) && strchr(kdb_buffer, '\n'))
-                kdb_nextline++;
+        if (KDB_STATE(PAGER)) {
+                /*
+                 * Check printed string to decide how to bump the
+                 * kdb_nextline to control when the more prompt should
+                 * show up.
+                 */
+                int got = 0;
+                len = retlen;
+                while (len--) {
+                        if (kdb_buffer[len] == '\n') {
+                                kdb_nextline++;
+                                got = 0;
+                        } else if (kdb_buffer[len] == '\r') {
+                                got = 0;
+                        } else {
+                                got++;
+                        }
+                }
+                kdb_nextline += got / (colcount + 1);
+        }
 
         /* check for having reached the LINES number of printed lines */
-        if (kdb_nextline == linecount) {
+        if (kdb_nextline >= linecount) {
                 char buf1[16] = "";
 
                 /* Watch out for recursion here.  Any routine that calls
@@ -765,7 +788,7 @@ kdb_printit:
                         kdb_grepping_flag = 0;
                         kdb_printf("\n");
                 } else if (buf1[0] == ' ') {
-                        kdb_printf("\n");
+                        kdb_printf("\r");
                         suspend_grep = 1; /* for this recursion */
                 } else if (buf1[0] == '\n') {
                         kdb_nextline = linecount - 1;