Merge branch 'linus' into timers/urgent

Get upstream changes so we can apply fixes against them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 27 insertions, 19 deletions

diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
index a0e97c299410..58a8289dd650 100644
--- a/scripts/kconfig/lxdialog/util.c
+++ b/scripts/kconfig/lxdialog/util.c
@@ -254,7 +254,12 @@ void attr_clear(WINDOW * win, int height, int width, chtype attr)
 
 void dialog_clear(void)
 {
-        attr_clear(stdscr, LINES, COLS, dlg.screen.atr);
+        int lines, columns;
+
+        lines = getmaxy(stdscr);
+        columns = getmaxx(stdscr);
+
+        attr_clear(stdscr, lines, columns, dlg.screen.atr);
         /* Display background title if it exists ... - SLH */
         if (dlg.backtitle != NULL) {
                 int i, len = 0, skip = 0;
@@ -269,10 +274,10 @@ void dialog_clear(void)
                 }
 
                 wmove(stdscr, 1, 1);
-                if (len > COLS - 2) {
+                if (len > columns - 2) {
                         const char *ellipsis = "[...] ";
                         waddstr(stdscr, ellipsis);
-                        skip = len - (COLS - 2 - strlen(ellipsis));
+                        skip = len - (columns - 2 - strlen(ellipsis));
                 }
 
                 for (pos = dlg.subtitles; pos != NULL; pos = pos->next) {
@@ -298,7 +303,7 @@ void dialog_clear(void)
                                 skip--;
                 }
 
-                for (i = len + 1; i < COLS - 1; i++)
+                for (i = len + 1; i < columns - 1; i++)
                         waddch(stdscr, ACS_HLINE);
         }
         wnoutrefresh(stdscr);
@@ -317,7 +322,7 @@ int init_dialog(const char *backtitle)
         getyx(stdscr, saved_y, saved_x);
 
         getmaxyx(stdscr, height, width);
-        if (height < 19 || width < 80) {
+        if (height < WINDOW_HEIGTH_MIN || width < WINDOW_WIDTH_MIN) {
                 endwin();
                 return -ERRDISPLAYTOOSMALL;
         }
@@ -371,27 +376,19 @@ void print_title(WINDOW *dialog, const char *title, int width)
 /*
  * Print a string of text in a window, automatically wrap around to the
  * next line if the string is too long to fit on one line. Newline
- * characters '\n' are replaced by spaces.  We start on a new line
+ * characters '\n' are propperly processed.  We start on a new line
  * if there is no room for at least 4 nonblanks following a double-space.
  */
 void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x)
 {
         int newl, cur_x, cur_y;
-        int i, prompt_len, room, wlen;
-        char tempstr[MAX_LEN + 1], *word, *sp, *sp2;
+        int prompt_len, room, wlen;
+        char tempstr[MAX_LEN + 1], *word, *sp, *sp2, *newline_separator = 0;
 
         strcpy(tempstr, prompt);
 
         prompt_len = strlen(tempstr);
 
-        /*
-         * Remove newlines
-         */
-        for (i = 0; i < prompt_len; i++) {
-                if (tempstr[i] == '\n')
-                        tempstr[i] = ' ';
-        }
-
         if (prompt_len <= width - x * 2) {      /* If prompt is short */
                 wmove(win, y, (width - prompt_len) / 2);
                 waddstr(win, tempstr);
@@ -401,7 +398,10 @@ void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x)
                 newl = 1;
                 word = tempstr;
                 while (word && *word) {
-                        sp = strchr(word, ' ');
+                        sp = strpbrk(word, "\n ");
+                        if (sp && *sp == '\n')
+                                newline_separator = sp;
+
                         if (sp)
                                 *sp++ = 0;
 
@@ -413,7 +413,7 @@ void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x)
                         if (wlen > room ||
                             (newl && wlen < 4 && sp
                              && wlen + 1 + strlen(sp) > room
-                             && (!(sp2 = strchr(sp, ' '))
+                             && (!(sp2 = strpbrk(sp, "\n "))
                                  || wlen + 1 + (sp2 - sp) > room))) {
                                 cur_y++;
                                 cur_x = x;
@@ -421,7 +421,15 @@ void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x)
                         wmove(win, cur_y, cur_x);
                         waddstr(win, word);
                         getyx(win, cur_y, cur_x);
-                        cur_x++;
+
+                        /* Move to the next line if the word separator was a newline */
+                        if (newline_separator) {
+                                cur_y++;
+                                cur_x = x;
+                                newline_separator = 0;
+                        } else
+                                cur_x++;
+
                         if (sp && *sp == ' ') {
                                 cur_x++;        /* double space */
                                 while (*++sp == ' ') ;