* grub-core/normal/cmdline.c (grub_cmdline_get):

	Remove nested functions.

diff --git a/ChangeLog b/ChangeLog
index 9e9d35ab066a8291f93f66ff3368887d53c07cc2..89b0bb3fdcd7befe4433ba0dcb6bafd8c4188af3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/normal/cmdline.c (grub_cmdline_get):
+       Remove nested functions.
+
 2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * tests/test_sha512sum.in: Make it work on emu.

diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
index f7cd115d7cb148e271f56454deda88848f09c61b..2ef500ffbb1da3af3fd5af0e1c150fd0cbe04793 100644 (file)
--- a/grub-core/normal/cmdline.c
+++ b/grub-core/normal/cmdline.c
@@ -212,143 +212,142 @@ struct cmdline_term
   struct grub_term_output *term;
 };
 
-/* Get a command-line. If ESC is pushed, return zero,
-   otherwise return command line.  */
-/* FIXME: The dumb interface is not supported yet.  */
-char *
-grub_cmdline_get (const char *prompt_translated)
+static inline void
+cl_set_pos (struct cmdline_term *cl_term, grub_size_t lpos)
 {
-  grub_size_t lpos, llen;
-  grub_uint32_t *buf;
-  grub_size_t max_len = 256;
-  int key;
-  int histpos = 0;
-  auto void cl_insert (const grub_uint32_t *str);
-  auto void cl_delete (unsigned len);
-  auto inline void __attribute__ ((always_inline)) cl_print (struct cmdline_term *cl_term, int pos,
-                       grub_uint32_t c);
-  auto void cl_set_pos (struct cmdline_term *cl_term);
-  auto void cl_print_all (int pos, grub_uint32_t c);
-  auto void cl_set_pos_all (void);
-  auto void init_clterm (struct cmdline_term *cl_term_cur);
-  auto void init_clterm_all (void);
-  struct cmdline_term *cl_terms;
-  char *ret;
-  unsigned nterms;
+  cl_term->pos.x = (cl_term->prompt_len + lpos) % cl_term->width;
+  cl_term->pos.y = cl_term->ystart
+    + (cl_term->prompt_len + lpos) / cl_term->width;
+  grub_term_gotoxy (cl_term->term, cl_term->pos);
+}
 
-  void cl_set_pos (struct cmdline_term *cl_term)
-  {
-    cl_term->pos.x = (cl_term->prompt_len + lpos) % cl_term->width;
-    cl_term->pos.y = cl_term->ystart
-      + (cl_term->prompt_len + lpos) / cl_term->width;
-    grub_term_gotoxy (cl_term->term, cl_term->pos);
-  }
+static void
+cl_set_pos_all (struct cmdline_term *cl_terms, unsigned nterms,
+               grub_size_t lpos)
+{
+  unsigned i;
+  for (i = 0; i < nterms; i++)
+    cl_set_pos (&cl_terms[i], lpos);
+}
 
-  void cl_set_pos_all (void)
-  {
-    unsigned i;
-    for (i = 0; i < nterms; i++)
-      cl_set_pos (&cl_terms[i]);
-  }
+static inline void __attribute__ ((always_inline))
+cl_print (struct cmdline_term *cl_term, grub_uint32_t c,
+         grub_uint32_t *start, grub_uint32_t *end)
+{
+  grub_uint32_t *p;
 
-  inline void __attribute__ ((always_inline)) cl_print (struct cmdline_term *cl_term, int pos, grub_uint32_t c)
+  for (p = start; p < end; p++)
     {
-      grub_uint32_t *p;
-
-      for (p = buf + pos; p < buf + llen; p++)
+      if (c)
+       grub_putcode (c, cl_term->term);
+      else
+       grub_putcode (*p, cl_term->term);
+      cl_term->pos.x++;
+      if (cl_term->pos.x >= cl_term->width - 1)
        {
-         if (c)
-           grub_putcode (c, cl_term->term);
+         cl_term->pos.x = 0;
+         if (cl_term->pos.y >= (unsigned) (cl_term->height - 1))
+           cl_term->ystart--;
          else
-           grub_putcode (*p, cl_term->term);
-         cl_term->pos.x++;
-         if (cl_term->pos.x >= cl_term->width - 1)
-           {
-             cl_term->pos.x = 0;
-             if (cl_term->pos.y >= (unsigned) (cl_term->height - 1))
-               cl_term->ystart--;
-             else
-               cl_term->pos.y++;
-             grub_putcode ('\n', cl_term->term);
-           }
+           cl_term->pos.y++;
+         grub_putcode ('\n', cl_term->term);
        }
     }
+}
 
-  void cl_print_all (int pos, grub_uint32_t c)
-  {
-    unsigned i;
-    for (i = 0; i < nterms; i++)
-      cl_print (&cl_terms[i], pos, c);
-  }
+static void
+cl_print_all (struct cmdline_term *cl_terms, unsigned nterms,
+             grub_uint32_t c, grub_uint32_t *start, grub_uint32_t *end)
+{
+  unsigned i;
+  for (i = 0; i < nterms; i++)
+    cl_print (&cl_terms[i], c, start, end);
+}
 
-  void cl_insert (const grub_uint32_t *str)
+static void
+init_clterm (struct cmdline_term *cl_term_cur)
+{
+  cl_term_cur->pos.x = cl_term_cur->prompt_len;
+  cl_term_cur->pos.y = grub_term_getxy (cl_term_cur->term).y;
+  cl_term_cur->ystart = cl_term_cur->pos.y;
+  cl_term_cur->width = grub_term_width (cl_term_cur->term);
+  cl_term_cur->height = grub_term_height (cl_term_cur->term);
+}
+
+
+static void
+cl_delete (struct cmdline_term *cl_terms, unsigned nterms,
+          grub_uint32_t *buf,
+          grub_size_t lpos, grub_size_t *llen, unsigned len)
+{
+  if (lpos + len <= (*llen))
     {
-      grub_size_t len = strlen_ucs4 (str);
+      cl_set_pos_all (cl_terms, nterms, (*llen) - len);
+      cl_print_all (cl_terms, nterms, ' ', buf + (*llen) - len, buf + (*llen));
 
-      if (len + llen >= max_len)
-       {
-         grub_uint32_t *nbuf;
-         max_len *= 2;
-         nbuf = grub_realloc (buf, sizeof (grub_uint32_t) * max_len);
-         if (nbuf)
-           buf = nbuf;
-         else
-           {
-             grub_print_error ();
-             grub_errno = GRUB_ERR_NONE;
-             max_len /= 2;
-           }
-       }
+      cl_set_pos_all (cl_terms, nterms, lpos);
 
-      if (len + llen < max_len)
-       {
-         grub_memmove (buf + lpos + len, buf + lpos,
-                       (llen - lpos + 1) * sizeof (grub_uint32_t));
-         grub_memmove (buf + lpos, str, len * sizeof (grub_uint32_t));
-
-         llen += len;
-         cl_set_pos_all ();
-         cl_print_all (lpos, 0);
-         lpos += len;
-         cl_set_pos_all ();
-       }
+      grub_memmove (buf + lpos, buf + lpos + len,
+                   sizeof (grub_uint32_t) * ((*llen) - lpos + 1));
+      (*llen) -= len;
+      cl_print_all (cl_terms, nterms, 0, buf + lpos, buf + (*llen));
+      cl_set_pos_all (cl_terms, nterms, lpos);
     }
+}
+
 
-  void cl_delete (unsigned len)
+static void
+cl_insert (struct cmdline_term *cl_terms, unsigned nterms,
+          grub_size_t *lpos, grub_size_t *llen,
+          grub_size_t *max_len, grub_uint32_t **buf,
+          const grub_uint32_t *str)
+{
+  grub_size_t len = strlen_ucs4 (str);
+
+  if (len + (*llen) >= (*max_len))
     {
-      if (lpos + len <= llen)
+      grub_uint32_t *nbuf;
+      (*max_len) *= 2;
+      nbuf = grub_realloc ((*buf), sizeof (grub_uint32_t) * (*max_len));
+      if (nbuf)
+       (*buf) = nbuf;
+      else
        {
-         grub_size_t saved_lpos = lpos;
-
-         lpos = llen - len;
-         cl_set_pos_all ();
-         cl_print_all (lpos, ' ');
-         lpos = saved_lpos;
-         cl_set_pos_all ();
-
-         grub_memmove (buf + lpos, buf + lpos + len,
-                       sizeof (grub_uint32_t) * (llen - lpos + 1));
-         llen -= len;
-         cl_print_all (lpos, 0);
-         cl_set_pos_all ();
+         grub_print_error ();
+         grub_errno = GRUB_ERR_NONE;
+         (*max_len) /= 2;
        }
     }
 
-  void init_clterm (struct cmdline_term *cl_term_cur)
-  {
-    cl_term_cur->pos.x = cl_term_cur->prompt_len;
-    cl_term_cur->pos.y = grub_term_getxy (cl_term_cur->term).y;
-    cl_term_cur->ystart = cl_term_cur->pos.y;
-    cl_term_cur->width = grub_term_width (cl_term_cur->term);
-    cl_term_cur->height = grub_term_height (cl_term_cur->term);
-  }
+  if (len + (*llen) < (*max_len))
+    {
+      grub_memmove ((*buf) + (*lpos) + len, (*buf) + (*lpos),
+                   ((*llen) - (*lpos) + 1) * sizeof (grub_uint32_t));
+      grub_memmove ((*buf) + (*lpos), str, len * sizeof (grub_uint32_t));
+
+      (*llen) += len;
+      cl_set_pos_all (cl_terms, nterms, (*lpos));
+      cl_print_all (cl_terms, nterms, 0, *buf + (*lpos), *buf + (*llen));
+      (*lpos) += len;
+      cl_set_pos_all (cl_terms, nterms, (*lpos));
+    }
+}
 
-  void init_clterm_all (void)
-  {
-    unsigned i;
-    for (i = 0; i < nterms; i++)
-      init_clterm (&cl_terms[i]);
-  }
+
+/* Get a command-line. If ESC is pushed, return zero,
+   otherwise return command line.  */
+/* FIXME: The dumb interface is not supported yet.  */
+char *
+grub_cmdline_get (const char *prompt_translated)
+{
+  grub_size_t lpos, llen;
+  grub_uint32_t *buf;
+  grub_size_t max_len = 256;
+  int key;
+  int histpos = 0;
+  struct cmdline_term *cl_terms;
+  char *ret;
+  unsigned nterms;
 
   buf = grub_malloc (max_len * sizeof (grub_uint32_t));
   if (!buf)
@@ -414,7 +413,7 @@ grub_cmdline_get (const char *prompt_translated)
        case GRUB_TERM_CTRL | 'a':
        case GRUB_TERM_KEY_HOME:
          lpos = 0;
-         cl_set_pos_all ();
+         cl_set_pos_all (cl_terms, nterms, lpos);
          break;
 
        case GRUB_TERM_CTRL | 'b':
@@ -422,14 +421,14 @@ grub_cmdline_get (const char *prompt_translated)
          if (lpos > 0)
            {
              lpos--;
-             cl_set_pos_all ();
+             cl_set_pos_all (cl_terms, nterms, lpos);
            }
          break;
 
        case GRUB_TERM_CTRL | 'e':
        case GRUB_TERM_KEY_END:
          lpos = llen;
-         cl_set_pos_all ();
+         cl_set_pos_all (cl_terms, nterms, lpos);
          break;
 
        case GRUB_TERM_CTRL | 'f':
@@ -437,7 +436,7 @@ grub_cmdline_get (const char *prompt_translated)
          if (lpos < llen)
            {
              lpos++;
-             cl_set_pos_all ();
+             cl_set_pos_all (cl_terms, nterms, lpos);
            }
          break;
 
@@ -469,12 +468,17 @@ grub_cmdline_get (const char *prompt_translated)
 
            if (restore)
              {
+               unsigned i;
+
                /* Restore the prompt.  */
                grub_xputs ("\n");
                grub_xputs (prompt_translated);
                grub_xputs (" ");
-               init_clterm_all ();
-               cl_print_all (0, 0);
+
+               for (i = 0; i < nterms; i++)
+                 init_clterm (&cl_terms[i]);
+
+               cl_print_all (cl_terms, nterms, 0, buf, buf + llen);
              }
 
            if (insertu8)
@@ -501,20 +505,20 @@ grub_cmdline_get (const char *prompt_translated)
                      {
                        insert[t-1] = 0;
                        if (t != 1)
-                         cl_insert (insert);
+                         cl_insert (cl_terms, nterms, &lpos, &llen, &max_len, &buf, insert);
                        lpos++;
                      }
                    else
                      {
                        insert[t] = 0;
-                       cl_insert (insert);
+                       cl_insert (cl_terms, nterms, &lpos, &llen, &max_len, &buf, insert);
                      }
                  }
 
                grub_free (insertu8);
                grub_free (insert);
              }
-           cl_set_pos_all ();
+           cl_set_pos_all (cl_terms, nterms, lpos);
          }
          break;
 
@@ -537,7 +541,8 @@ grub_cmdline_get (const char *prompt_translated)
                  kill_buf[llen - lpos] = 0;
                }
 
-             cl_delete (llen - lpos);
+             cl_delete (cl_terms, nterms,
+                        buf, lpos, &llen, llen - lpos);
            }
          break;
 
@@ -554,9 +559,10 @@ grub_cmdline_get (const char *prompt_translated)
                histpos--;
              }
 
-           cl_delete (llen);
+           cl_delete (cl_terms, nterms,
+                      buf, lpos, &llen, llen);
            hist = grub_history_get (histpos);
-           cl_insert (hist);
+           cl_insert (cl_terms, nterms, &lpos, &llen, &max_len, &buf, hist);
 
            break;
          }
@@ -574,10 +580,11 @@ grub_cmdline_get (const char *prompt_translated)
                histpos++;
              }
 
-           cl_delete (llen);
+           cl_delete (cl_terms, nterms,
+                      buf, lpos, &llen, llen);
            hist = grub_history_get (histpos);
 
-           cl_insert (hist);
+           cl_insert (cl_terms, nterms, &lpos, &llen, &max_len, &buf, hist);
          }
          break;
 
@@ -601,14 +608,15 @@ grub_cmdline_get (const char *prompt_translated)
                }
 
              lpos = 0;
-             cl_set_pos_all ();
-             cl_delete (n);
+             cl_set_pos_all (cl_terms, nterms, lpos);
+             cl_delete (cl_terms, nterms,
+                        buf, lpos, &llen, n);
            }
          break;
 
        case GRUB_TERM_CTRL | 'y':
          if (kill_buf)
-           cl_insert (kill_buf);
+           cl_insert (cl_terms, nterms, &lpos, &llen, &max_len, &buf, kill_buf);
          break;
 
        case '\e':
@@ -619,7 +627,7 @@ grub_cmdline_get (const char *prompt_translated)
          if (lpos > 0)
            {
              lpos--;
-             cl_set_pos_all ();
+             cl_set_pos_all (cl_terms, nterms, lpos);
            }
           else
             break;
@@ -628,7 +636,8 @@ grub_cmdline_get (const char *prompt_translated)
        case GRUB_TERM_CTRL | 'd':
        case GRUB_TERM_KEY_DC:
          if (lpos < llen)
-           cl_delete (1);
+           cl_delete (cl_terms, nterms,
+                      buf, lpos, &llen, 1);
          break;
 
        default:
@@ -638,7 +647,7 @@ grub_cmdline_get (const char *prompt_translated)
 
              str[0] = key;
              str[1] = '\0';
-             cl_insert (str);
+             cl_insert (cl_terms, nterms, &lpos, &llen, &max_len, &buf, str);
            }
          break;
        }