Updated to match trunk/uClibc/extra/config as of r10132, and thus

Linux 2.6.11.

1 files changed, 77 insertions, 343 deletions

diff --git a/scripts/config/util.c b/scripts/config/util.c
index 0a2f82757..a72f5ea66 100644
--- a/scripts/config/util.c
+++ b/scripts/config/util.c
@@ -1,375 +1,109 @@
 /*
- *  util.c
+ * Copyright (C) 2002-2005 Roman Zippel <zippel@linux-m68k.org>
+ * Copyright (C) 2002-2005 Sam Ravnborg <sam@ravnborg.org>
  *
- *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
- *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "dialog.h"
-
-
-/* use colors by default? */
-bool use_colors = 1;
-
-char *backtitle = NULL;
-
-const char *dialog_result;
-
-/*
- * Attribute values, default is for mono display
- */
-chtype attributes[] =
-{
-    A_NORMAL,                   /* screen_attr */
-    A_NORMAL,                   /* shadow_attr */
-    A_NORMAL,                   /* dialog_attr */
-    A_BOLD,                     /* title_attr */
-    A_NORMAL,                   /* border_attr */
-    A_REVERSE,                  /* button_active_attr */
-    A_DIM,                      /* button_inactive_attr */
-    A_REVERSE,                  /* button_key_active_attr */
-    A_BOLD,                     /* button_key_inactive_attr */
-    A_REVERSE,                  /* button_label_active_attr */
-    A_NORMAL,                   /* button_label_inactive_attr */
-    A_NORMAL,                   /* inputbox_attr */
-    A_NORMAL,                   /* inputbox_border_attr */
-    A_NORMAL,                   /* searchbox_attr */
-    A_BOLD,                     /* searchbox_title_attr */
-    A_NORMAL,                   /* searchbox_border_attr */
-    A_BOLD,                     /* position_indicator_attr */
-    A_NORMAL,                   /* menubox_attr */
-    A_NORMAL,                   /* menubox_border_attr */
-    A_NORMAL,                   /* item_attr */
-    A_REVERSE,                  /* item_selected_attr */
-    A_BOLD,                     /* tag_attr */
-    A_REVERSE,                  /* tag_selected_attr */
-    A_BOLD,                     /* tag_key_attr */
-    A_REVERSE,                  /* tag_key_selected_attr */
-    A_BOLD,                     /* check_attr */
-    A_REVERSE,                  /* check_selected_attr */
-    A_BOLD,                     /* uarrow_attr */
-    A_BOLD                      /* darrow_attr */
-};
-
-
-#include "colors.h"
-
-/*
- * Table of color values
- */
-int color_table[][3] =
-{
-    {SCREEN_FG, SCREEN_BG, SCREEN_HL},
-    {SHADOW_FG, SHADOW_BG, SHADOW_HL},
-    {DIALOG_FG, DIALOG_BG, DIALOG_HL},
-    {TITLE_FG, TITLE_BG, TITLE_HL},
-    {BORDER_FG, BORDER_BG, BORDER_HL},
-    {BUTTON_ACTIVE_FG, BUTTON_ACTIVE_BG, BUTTON_ACTIVE_HL},
-    {BUTTON_INACTIVE_FG, BUTTON_INACTIVE_BG, BUTTON_INACTIVE_HL},
-    {BUTTON_KEY_ACTIVE_FG, BUTTON_KEY_ACTIVE_BG, BUTTON_KEY_ACTIVE_HL},
-    {BUTTON_KEY_INACTIVE_FG, BUTTON_KEY_INACTIVE_BG, BUTTON_KEY_INACTIVE_HL},
-    {BUTTON_LABEL_ACTIVE_FG, BUTTON_LABEL_ACTIVE_BG, BUTTON_LABEL_ACTIVE_HL},
-    {BUTTON_LABEL_INACTIVE_FG, BUTTON_LABEL_INACTIVE_BG,
-     BUTTON_LABEL_INACTIVE_HL},
-    {INPUTBOX_FG, INPUTBOX_BG, INPUTBOX_HL},
-    {INPUTBOX_BORDER_FG, INPUTBOX_BORDER_BG, INPUTBOX_BORDER_HL},
-    {SEARCHBOX_FG, SEARCHBOX_BG, SEARCHBOX_HL},
-    {SEARCHBOX_TITLE_FG, SEARCHBOX_TITLE_BG, SEARCHBOX_TITLE_HL},
-    {SEARCHBOX_BORDER_FG, SEARCHBOX_BORDER_BG, SEARCHBOX_BORDER_HL},
-    {POSITION_INDICATOR_FG, POSITION_INDICATOR_BG, POSITION_INDICATOR_HL},
-    {MENUBOX_FG, MENUBOX_BG, MENUBOX_HL},
-    {MENUBOX_BORDER_FG, MENUBOX_BORDER_BG, MENUBOX_BORDER_HL},
-    {ITEM_FG, ITEM_BG, ITEM_HL},
-    {ITEM_SELECTED_FG, ITEM_SELECTED_BG, ITEM_SELECTED_HL},
-    {TAG_FG, TAG_BG, TAG_HL},
-    {TAG_SELECTED_FG, TAG_SELECTED_BG, TAG_SELECTED_HL},
-    {TAG_KEY_FG, TAG_KEY_BG, TAG_KEY_HL},
-    {TAG_KEY_SELECTED_FG, TAG_KEY_SELECTED_BG, TAG_KEY_SELECTED_HL},
-    {CHECK_FG, CHECK_BG, CHECK_HL},
-    {CHECK_SELECTED_FG, CHECK_SELECTED_BG, CHECK_SELECTED_HL},
-    {UARROW_FG, UARROW_BG, UARROW_HL},
-    {DARROW_FG, DARROW_BG, DARROW_HL},
-};                              /* color_table */
-
-/*
- * Set window to attribute 'attr'
+ * Released under the terms of the GNU GPL v2.0.
  */
-void
-attr_clear (WINDOW * win, int height, int width, chtype attr)
-{
-    int i, j;
-
-    wattrset (win, attr);
-    for (i = 0; i < height; i++) {
-        wmove (win, i, 0);
-        for (j = 0; j < width; j++)
-            waddch (win, ' ');
-    }
-    touchwin (win);
-}
 
-void dialog_clear (void)
-{
-    attr_clear (stdscr, LINES, COLS, screen_attr);
-    /* Display background title if it exists ... - SLH */
-    if (backtitle != NULL) {
-        int i;
-
-        wattrset (stdscr, screen_attr);
-        mvwaddstr (stdscr, 0, 1, (char *)backtitle);
-        wmove (stdscr, 1, 1);
-        for (i = 1; i < COLS - 1; i++)
-            waddch (stdscr, ACS_HLINE);
-    }
-    wnoutrefresh (stdscr);
-}
+#include <string.h>
+#include "lkc.h"
 
-/*
- * Do some initialization for dialog
- */
-void
-init_dialog (void)
-{
-    initscr ();                 /* Init curses */
-    keypad (stdscr, TRUE);
-    cbreak ();
-    noecho ();
-
-
-    if (use_colors)     /* Set up colors */
-        color_setup ();
-
-
-    dialog_clear ();
-}
-
-/*
- * Setup for color display
- */
-void
-color_setup (void)
+/* file already present in list? If not add it */
+struct file *file_lookup(const char *name)
 {
-    int i;
+        struct file *file;
 
-    if (has_colors ()) {        /* Terminal supports color? */
-        start_color ();
-
-        /* Initialize color pairs */
-        for (i = 0; i < ATTRIBUTE_COUNT; i++)
-            init_pair (i + 1, color_table[i][0], color_table[i][1]);
+        for (file = file_list; file; file = file->next) {
+                if (!strcmp(name, file->name))
+                        return file;
+        }
 
-        /* Setup color attributes */
-        for (i = 0; i < ATTRIBUTE_COUNT; i++)
-            attributes[i] = C_ATTR (color_table[i][2], i + 1);
-    }
+        file = malloc(sizeof(*file));
+        memset(file, 0, sizeof(*file));
+        file->name = strdup(name);
+        file->next = file_list;
+        file_list = file;
+        return file;
 }
 
-/*
- * End using dialog functions.
- */
-void
-end_dialog (void)
+/* write a dependency file as used by kbuild to track dependencies */
+int file_write_dep(const char *name)
 {
-    endwin ();
+        struct file *file;
+        FILE *out;
+
+        if (!name)
+                name = ".config.cmd";
+        out = fopen(".config.tmp", "w");
+        if (!out)
+                return 1;
+        fprintf(out, "deps_config := \\\n");
+        for (file = file_list; file; file = file->next) {
+                if (file->next)
+                        fprintf(out, "\t%s \\\n", file->name);
+                else
+                        fprintf(out, "\t%s\n", file->name);
+        }
+        fprintf(out, "\n.config include/config.h: $(deps_config)\n\n$(deps_config):\n");
+        fclose(out);
+        rename(".config.tmp", name);
+        return 0;
 }
 
 
-/*
- * 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
- * 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)
+/* Allocate initial growable sting */
+struct gstr str_new(void)
 {
-    int newl, cur_x, cur_y;
-    int i, prompt_len, room, wlen;
-    char tempstr[MAX_LEN + 1], *word, *sp, *sp2;
-
-    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);
-    } else {
-        cur_x = x;
-        cur_y = y;
-        newl = 1;
-        word = tempstr;
-        while (word && *word) {
-            sp = index(word, ' ');
-            if (sp)
-                *sp++ = 0;
-
-            /* Wrap to next line if either the word does not fit,
-               or it is the first word of a new sentence, and it is
-               short, and the next word does not fit. */
-            room = width - cur_x;
-            wlen = strlen(word);
-            if (wlen > room ||
-               (newl && wlen < 4 && sp && wlen+1+strlen(sp) > room
-                     && (!(sp2 = index(sp, ' ')) || wlen+1+(sp2-sp) > room))) {
-                cur_y++;
-                cur_x = x;
-            }
-            wmove (win, cur_y, cur_x);
-            waddstr (win, word);
-            getyx (win, cur_y, cur_x);
-            cur_x++;
-            if (sp && *sp == ' ') {
-                cur_x++;        /* double space */
-                while (*++sp == ' ');
-                newl = 1;
-            } else
-                newl = 0;
-            word = sp;
-        }
-    }
+        struct gstr gs;
+        gs.s = malloc(sizeof(char) * 64);
+        gs.len = 16;
+        strcpy(gs.s, "\0");
+        return gs;
 }
 
-/*
- * Print a button
- */
-void
-print_button (WINDOW * win, const char *label, int y, int x, int selected)
+/* Allocate and assign growable string */
+struct gstr str_assign(const char *s)
 {
-    int i, temp;
-
-    wmove (win, y, x);
-    wattrset (win, selected ? button_active_attr : button_inactive_attr);
-    waddstr (win, "<");
-    temp = strspn (label, " ");
-    label += temp;
-    wattrset (win, selected ? button_label_active_attr
-              : button_label_inactive_attr);
-    for (i = 0; i < temp; i++)
-        waddch (win, ' ');
-    wattrset (win, selected ? button_key_active_attr
-              : button_key_inactive_attr);
-    waddch (win, label[0]);
-    wattrset (win, selected ? button_label_active_attr
-              : button_label_inactive_attr);
-    waddstr (win, (char *)label + 1);
-    wattrset (win, selected ? button_active_attr : button_inactive_attr);
-    waddstr (win, ">");
-    wmove (win, y, x + temp + 1);
+        struct gstr gs;
+        gs.s = strdup(s);
+        gs.len = strlen(s) + 1;
+        return gs;
 }
 
-/*
- * Draw a rectangular box with line drawing characters
- */
-void
-draw_box (WINDOW * win, int y, int x, int height, int width,
-          chtype box, chtype border)
+/* Free storage for growable string */
+void str_free(struct gstr *gs)
 {
-    int i, j;
-
-    wattrset (win, 0);
-    for (i = 0; i < height; i++) {
-        wmove (win, y + i, x);
-        for (j = 0; j < width; j++)
-            if (!i && !j)
-                waddch (win, border | ACS_ULCORNER);
-            else if (i == height - 1 && !j)
-                waddch (win, border | ACS_LLCORNER);
-            else if (!i && j == width - 1)
-                waddch (win, box | ACS_URCORNER);
-            else if (i == height - 1 && j == width - 1)
-                waddch (win, box | ACS_LRCORNER);
-            else if (!i)
-                waddch (win, border | ACS_HLINE);
-            else if (i == height - 1)
-                waddch (win, box | ACS_HLINE);
-            else if (!j)
-                waddch (win, border | ACS_VLINE);
-            else if (j == width - 1)
-                waddch (win, box | ACS_VLINE);
-            else
-                waddch (win, box | ' ');
-    }
+        if (gs->s)
+                free(gs->s);
+        gs->s = NULL;
+        gs->len = 0;
 }
 
-/*
- * Draw shadows along the right and bottom edge to give a more 3D look
- * to the boxes
- */
-void
-draw_shadow (WINDOW * win, int y, int x, int height, int width)
+/* Append to growable string */
+void str_append(struct gstr *gs, const char *s)
 {
-    int i;
-
-    if (has_colors ()) {        /* Whether terminal supports color? */
-        wattrset (win, shadow_attr);
-        wmove (win, y + height, x + 2);
-        for (i = 0; i < width; i++)
-            waddch (win, winch (win) & A_CHARTEXT);
-        for (i = y + 1; i < y + height + 1; i++) {
-            wmove (win, i, x + width);
-            waddch (win, winch (win) & A_CHARTEXT);
-            waddch (win, winch (win) & A_CHARTEXT);
+        size_t l = strlen(gs->s) + strlen(s) + 1;
+        if (l > gs->len) {
+                gs->s   = realloc(gs->s, l);
+                gs->len = l;
         }
-        wnoutrefresh (win);
-    }
+        strcat(gs->s, s);
 }
 
-/*
- *  Return the position of the first alphabetic character in a string.
- */
-int
-first_alpha(const char *string, const char *exempt)
+/* Append printf formatted string to growable string */
+void str_printf(struct gstr *gs, const char *fmt, ...)
 {
-        int i, in_paren=0, c;
-
-        for (i = 0; i < strlen(string); i++) {
-                c = tolower(string[i]);
-
-                if (strchr("<[(", c)) ++in_paren;
-                if (strchr(">])", c) && in_paren > 0) --in_paren;
-
-                if ((! in_paren) && isalpha(c) &&
-                     strchr(exempt, c) == 0)
-                        return i;
-        }
-
-        return 0;
+        va_list ap;
+        char s[10000]; /* big enough... */
+        va_start(ap, fmt);
+        vsnprintf(s, sizeof(s), fmt, ap);
+        str_append(gs, s);
+        va_end(ap);
 }
 
-/*
- * Get the first selected item in the dialog_list_item list.
- */
-struct dialog_list_item *
-first_sel_item(int item_no, struct dialog_list_item ** items)
+/* Retreive value of growable string */
+const char *str_get(struct gstr *gs)
 {
-        int i;
-
-        for (i = 0; i < item_no; i++) {
-                if (items[i]->selected)
-                        return items[i];
-        }
-
-        return NULL;
+        return gs->s;
 }
+