author | mickeyl <mickeyl> | 2005-09-03 00:56:25 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-09-03 00:56:25 (UTC) |
commit | 5907b0aabc816287db5c7f2b1ec8d8bfce4d9c28 (patch) (unidiff) | |
tree | 21cc663f18f6207dc23797b87aad517de2c3281a | |
parent | 8a74037f6174f187ea3f5583d6c253752792128a (diff) | |
download | opie-5907b0aabc816287db5c7f2b1ec8d8bfce4d9c28.zip opie-5907b0aabc816287db5c7f2b1ec8d8bfce4d9c28.tar.gz opie-5907b0aabc816287db5c7f2b1ec8d8bfce4d9c28.tar.bz2 |
fix for gcc4
-rw-r--r-- | scripts/kconfig/mconf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index b9cf25f..0967471 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
@@ -59,65 +59,65 @@ load_config_help[] = | |||
59 | "For various reasons, one may wish to keep several different \n" | 59 | "For various reasons, one may wish to keep several different \n" |
60 | "configurations available on a single machine.\n" | 60 | "configurations available on a single machine.\n" |
61 | "\n" | 61 | "\n" |
62 | "If you have saved a previous configuration in a file other than the\n" | 62 | "If you have saved a previous configuration in a file other than the\n" |
63 | "default, entering the name of the file here will allow you\n" | 63 | "default, entering the name of the file here will allow you\n" |
64 | "to modify that configuration.\n" | 64 | "to modify that configuration.\n" |
65 | "\n" | 65 | "\n" |
66 | "If you are uncertain, then you have probably never used alternate\n" | 66 | "If you are uncertain, then you have probably never used alternate\n" |
67 | "configuration files. You should therefor leave this blank to abort.\n", | 67 | "configuration files. You should therefor leave this blank to abort.\n", |
68 | save_config_text[] = | 68 | save_config_text[] = |
69 | "Enter a filename to which this configuration should be saved " | 69 | "Enter a filename to which this configuration should be saved " |
70 | "as an alternate. Leave blank to abort.", | 70 | "as an alternate. Leave blank to abort.", |
71 | save_config_help[] = | 71 | save_config_help[] = |
72 | "\n" | 72 | "\n" |
73 | "For various reasons, one may wish to keep different\n" | 73 | "For various reasons, one may wish to keep different\n" |
74 | "configurations available on a single machine.\n" | 74 | "configurations available on a single machine.\n" |
75 | "\n" | 75 | "\n" |
76 | "Entering a file name here will allow you to later retrieve, modify\n" | 76 | "Entering a file name here will allow you to later retrieve, modify\n" |
77 | "and use the current configuration as an alternate to whatever\n" | 77 | "and use the current configuration as an alternate to whatever\n" |
78 | "configuration options you have selected at that time.\n" | 78 | "configuration options you have selected at that time.\n" |
79 | "\n" | 79 | "\n" |
80 | "If you are uncertain what all this means then you should probably\n" | 80 | "If you are uncertain what all this means then you should probably\n" |
81 | "leave this blank.\n" | 81 | "leave this blank.\n" |
82 | ; | 82 | ; |
83 | 83 | ||
84 | static char buf[4096], *bufptr = buf; | 84 | static char buf[4096], *bufptr = buf; |
85 | static char input_buf[4096]; | 85 | static char input_buf[4096]; |
86 | static char filename[PATH_MAX+1] = ".config"; | 86 | static char filename[PATH_MAX+1] = ".config"; |
87 | static char *args[1024], **argptr = args; | 87 | static char *args[1024], **argptr = args; |
88 | static int indent = 0; | 88 | static int indent = 0; |
89 | static struct termios ios_org; | 89 | static struct termios ios_org; |
90 | static int rows, cols; | 90 | static int rows, cols; |
91 | static struct menu *current_menu; | 91 | struct menu *current_menu; |
92 | static int child_count; | 92 | static int child_count; |
93 | static int do_resize; | 93 | static int do_resize; |
94 | static int single_menu_mode; | 94 | static int single_menu_mode; |
95 | 95 | ||
96 | static void conf(struct menu *menu); | 96 | static void conf(struct menu *menu); |
97 | static void conf_choice(struct menu *menu); | 97 | static void conf_choice(struct menu *menu); |
98 | static void conf_string(struct menu *menu); | 98 | static void conf_string(struct menu *menu); |
99 | static void conf_load(void); | 99 | static void conf_load(void); |
100 | static void conf_save(void); | 100 | static void conf_save(void); |
101 | static void show_textbox(const char *title, const char *text, int r, int c); | 101 | static void show_textbox(const char *title, const char *text, int r, int c); |
102 | static void show_helptext(const char *title, const char *text); | 102 | static void show_helptext(const char *title, const char *text); |
103 | static void show_help(struct menu *menu); | 103 | static void show_help(struct menu *menu); |
104 | static void show_readme(void); | 104 | static void show_readme(void); |
105 | 105 | ||
106 | static void cprint_init(void); | 106 | static void cprint_init(void); |
107 | static int cprint1(const char *fmt, ...); | 107 | static int cprint1(const char *fmt, ...); |
108 | static void cprint_done(void); | 108 | static void cprint_done(void); |
109 | static int cprint(const char *fmt, ...); | 109 | static int cprint(const char *fmt, ...); |
110 | 110 | ||
111 | static void init_wsize(void) | 111 | static void init_wsize(void) |
112 | { | 112 | { |
113 | struct winsize ws; | 113 | struct winsize ws; |
114 | char *env; | 114 | char *env; |
115 | 115 | ||
116 | if (ioctl(1, TIOCGWINSZ, &ws) == -1) { | 116 | if (ioctl(1, TIOCGWINSZ, &ws) == -1) { |
117 | rows = 24; | 117 | rows = 24; |
118 | cols = 80; | 118 | cols = 80; |
119 | } else { | 119 | } else { |
120 | rows = ws.ws_row; | 120 | rows = ws.ws_row; |
121 | cols = ws.ws_col; | 121 | cols = ws.ws_col; |
122 | if (!rows) { | 122 | if (!rows) { |
123 | env = getenv("LINES"); | 123 | env = getenv("LINES"); |