[kernel] refresh 3.0 patches

[openwrt.git] / scripts / config / conf.c

diff --git a/scripts/config/conf.c b/scripts/config/conf.c
index 6589aee..0a44a2e 100644 (file)
--- a/scripts/config/conf.c
+++ b/scripts/config/conf.c
@@ -508,9 +508,10 @@ int main(int ac, char **av)
 {
        int i = 1;
        const char *name;
+       char *output = NULL;
        struct stat tmpstat;
 
-       if (ac > i && av[i][0] == '-') {
+       while (ac > i && av[i][0] == '-') {
                switch (av[i++][1]) {
                case 'o':
                        input_mode = ask_new;
@@ -531,6 +532,9 @@ int main(int ac, char **av)
                                exit(1);
                        }
                        break;
+               case 'w':
+                       output = av[i++];
+                       break;
                case 'n':
                        input_mode = set_no;
                        break;
@@ -601,7 +605,7 @@ int main(int ac, char **av)
                conf_cnt = 0;
                check_conf(&rootmenu);
        } while (conf_cnt);
-       if (conf_write(NULL)) {
+       if (conf_write(output)) {
                fprintf(stderr, _("\n*** Error during writing of the build configuration.\n\n"));
                return 1;
        }