Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/scripts/kconfig

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

Location:

branches/3.2/mindi-busybox/scripts/kconfig

Files:

• Makefile (modified) (1 diff)
• conf.c (modified) (6 diffs)
• lxdialog/textbox.c (modified) (3 diffs)
• mconf.c (modified) (5 diffs)

branches/3.2/mindi-busybox/scripts/kconfig/Makefile

@@ -88 +88 @@
 
 %_defconfig: $(obj)/conf
-    $(Q)$< -D $@ Config.in
+    $(Q)$< -D configs/$@ Config.in
     $(MTIME_IS_COARSE) && sleep 1
 

branches/3.2/mindi-busybox/scripts/kconfig/conf.c

@@ -3 +3 @@
  * Released under the terms of the GNU GPL v2.0.
  */
+
+#define _XOPEN_SOURCE 700
 
 #include <ctype.h>
@@ -172 +174 @@
 {
     struct symbol *sym = menu->sym;
-    const char *def, *help;
+    const char *def;
 
     while (1) {
@@ -187 +189 @@
             /* print help */
             if (line[1] == '\n') {
-                help = nohelp_text;
-                if (menu->sym->help)
-                    help = menu->sym->help;
-                printf("\n%s\n", menu->sym->help);
+                printf("\n%s\n", menu->sym->help ? menu->sym->help : nohelp_text);
                 def = NULL;
                 break;
@@ -206 +205 @@
 {
     struct symbol *sym = menu->sym;
-    int type;
     tristate oldval, newval;
     const char *help;
@@ -214 +212 @@
         if (sym->name)
             printf("(%s) ", sym->name);
-        type = sym_get_type(sym);
         putchar('[');
         oldval = sym_get_tristate_value(sym);
@@ -281 +278 @@
     struct symbol *sym, *def_sym;
     struct menu *child;
-    int type;
     bool is_new;
 
     sym = menu->sym;
-    type = sym_get_type(sym);
     is_new = !sym_has_value(sym);
     if (sym_is_changable(sym)) {

branches/3.2/mindi-busybox/scripts/kconfig/lxdialog/textbox.c

@@ -39 +39 @@
     int i, x, y, cur_x, cur_y, fpos, key = 0;
     int passed_end;
-    char search_term[MAX_LEN + 1];
     WINDOW *dialog, *text;
-
-    search_term[0] = '\0';  /* no search term entered yet */
 
     /* Open input file for reading */
@@ -438 +435 @@
 static void print_line(WINDOW * win, int row, int width)
 {
-    int y, x;
     char *line;
 
@@ -447 +443 @@
     waddnstr(win, line, MIN(strlen(line), width - 2));
 
-    getyx(win, y, x);
     /* Clear 'residue' of previous line */
 #if OLD_NCURSES
     {
         int i;
+        int y, x;
+
+        getyx(win, y, x);
         for (i = 0; i < width - x; i++)
             waddch(win, ' ');

branches/3.2/mindi-busybox/scripts/kconfig/mconf.c

@@ -8 +8 @@
  * i18n, 2005, Arnaldo Carvalho de Melo <acme@conectiva.com.br>
  */
+
+#define _XOPEN_SOURCE 700
+/* On Darwin, this may be needed to get SIGWINCH: */
+#define _DARWIN_C_SOURCE 1
 
 #include <sys/ioctl.h>
@@ -19 +23 @@
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h> /* for strcasecmp */
 #include <termios.h>
 #include <unistd.h>
@@ -441 +446 @@
 pid_t pid;
 
+#ifdef SIGWINCH
 static void winch_handler(int sig)
 {
@@ -448 +454 @@
     }
 }
+#endif
 
 static int exec_conf(void)
 {
     int pipefd[2], stat, size;
-    struct sigaction sa;
     sigset_t sset, osset;
 
@@ -461 +467 @@
     signal(SIGINT, SIG_DFL);
 
-    sa.sa_handler = winch_handler;
-    sigemptyset(&sa.sa_mask);
-    sa.sa_flags = SA_RESTART;
-    sigaction(SIGWINCH, &sa, NULL);
+#ifdef SIGWINCH
+    {
+        struct sigaction sa;
+        sa.sa_handler = winch_handler;
+        sigemptyset(&sa.sa_mask);
+        sa.sa_flags = SA_RESTART;
+        sigaction(SIGWINCH, &sa, NULL);
+    }
+#endif
 
     *argptr++ = NULL;