The patch titled
kconfig: use getopt() in conf.c for handling command line arguments
has been removed from the -mm tree. Its filename was
kconfig-use-getopt-in-confc-for-handling-command-line.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: kconfig: use getopt() in conf.c for handling command line arguments
From: Andres Salomon <[EMAIL PROTECTED]>
First, rename ac/av to argc/argv; those are pretty conventional names.
Second, switch from doing our own parsing of command line arguments to
using getopt(3) to do it. Aside from simplifying things, this allows us to
specify multiple arguments; the old code could only accept two arguments
(input_mode and kconfig name).
Note some subtle changes:
- The argument '-?' is no longer supported.
- '-h' is not treated as an error, so output goes to stdout, and we
exit with '0'.
- There is no compatibility checking amongst arguments; the last option
will simply override earlier options. For example, 'conf -n -y foo'
is perfectly valid now (input_mode will be set_yes). Previously, that
would have been an error ("can't find file -y").
Signed-off-by: Andres Salomon <[EMAIL PROTECTED]>
Cc: Roman Zippel <[EMAIL PROTECTED]>
Cc: Sam Ravnborg <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
scripts/kconfig/conf.c | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff -puN
scripts/kconfig/conf.c~kconfig-use-getopt-in-confc-for-handling-command-line
scripts/kconfig/conf.c
---
a/scripts/kconfig/conf.c~kconfig-use-getopt-in-confc-for-handling-command-line
+++ a/scripts/kconfig/conf.c
@@ -493,14 +493,14 @@ static void check_conf(struct menu *menu
check_conf(child);
}
-int main(int ac, char **av)
+int main(int argc, char **argv)
{
- int i = 1;
+ int opt;
const char *name;
struct stat tmpstat;
- if (ac > i && av[i][0] == '-') {
- switch (av[i++][1]) {
+ while ((opt = getopt(argc, argv, "osdD:nmyrh")) != -1) {
+ switch (opt) {
case 'o':
input_mode = ask_new;
break;
@@ -513,12 +513,7 @@ int main(int ac, char **av)
break;
case 'D':
input_mode = set_default;
- defconfig_file = av[i++];
- if (!defconfig_file) {
- printf(_("%s: No default config file
specified\n"),
- av[0]);
- exit(1);
- }
+ defconfig_file = optarg;
break;
case 'n':
input_mode = set_no;
@@ -534,16 +529,19 @@ int main(int ac, char **av)
srandom(time(NULL));
break;
case 'h':
- case '?':
- fprintf(stderr, "See README for usage info\n");
+ printf("See README for usage info\n");
exit(0);
+ break;
+ default:
+ fprintf(stderr, "See README for usage info\n");
+ exit(1);
}
}
- name = av[i];
- if (!name) {
- printf(_("%s: Kconfig file missing\n"), av[0]);
+ if (argc == optind) {
+ printf(_("%s: Kconfig file missing\n"), argv[0]);
exit(1);
}
+ name = argv[optind];
conf_parse(name);
//zconfdump(stdout);
switch (input_mode) {
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
git-battery.patch
git-x86.patch
kernel-printkc-concerns-about-the-console-handover.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
