Skip to contentSkip to conversation

kconfig/conf: kill deadcode

PATCH In review Arnaud Lacombe 2 participants 6 messages Dec 5, 2010 – Dec 15, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 kconfig/conf: kill deadcode

This is likely to break the swith statement if the one of the enum member ever reach 63 ('?').

---
 scripts/kconfig/conf.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
scripts/kconfig/conf.c +0 -4
index 8e33aa7..057f49a 100644
@@ -503,10 +503,6 @@ int main(int ac, char **av)
 			srand(seed);
 			break;
 		}
-		case '?':
-			fprintf(stderr, _("See README for usage info\n"));
-			exit(1);
-			break;
 		}
 	}
 	if (ac == optind) {
Signature · 1 line
1.7.2.30.gc37d7.dirty
#1 lore raw

PATCH 2/2 kconfig/conf: add command line options' description

---
 scripts/kconfig/conf.c |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)
scripts/kconfig/conf.c +33 -0
index 057f49a..5297dbf 100644
@@ -468,8 +468,28 @@ static struct option long_opts[] = {
 	{NULL, 0, NULL, 0}
 };
 
+static void conf_usage(const char *progname)
+{
+
+	printf("Usage: %s [option] <kconfig-file>\n", progname);
+	printf("Option is one of the following:\n");
+	printf("  --listnewconfig         List new options\n");
+	printf("  --oldaskconfig          Start a new configuration using a line-oriented program\n");
+	printf("  --oldconfig             Update a configuration using a provided .config as base\n");
+	printf("  --silentoldconfig       Same as oldconfig, but quietly, additionally update deps\n");
+	printf("  --oldnoconfig           Same as silentoldconfig but set new symbols to no\n");
+	printf("  --defconfig [arg]       New config with default defined in the kconfig-filedefconfig\n");
+	printf("  --savedefconfig <file>  Save the minimal current configuration to <file>\n");
+	printf("  --allnoconfig           New config where all options are answered with no\n");
+	printf("  --allyesconfig          New config where all options are answered with yes\n");
+	printf("  --allmodconfig          New config where all options are answered with mod\n");
+	printf("  --alldefconfig          New config with all symbols set to default\n");
+	printf("  --randconfig            New config with random answer to all options\n");
+}
+
 int main(int ac, char **av)
 {
+	const char *progname = av[0];
 	int opt;
 	const char *name;
 	struct stat tmpstat;
@@ -503,10 +523,23 @@ int main(int ac, char **av)
 			srand(seed);
 			break;
 		}
+		case oldaskconfig:
+		case oldconfig:
+		case allnoconfig:
+		case allyesconfig:
+		case allmodconfig:
+		case alldefconfig:
+		case listnewconfig:
+		case oldnoconfig:
+			break;
+		default:
+			conf_usage(progname);
+			exit(1);
 		}
 	}
 	if (ac == optind) {
 		printf(_("%s: Kconfig file missing\n"), av[0]);
+		conf_usage(progname);
 		exit(1);
 	}
 	name = av[optind];
Signature · 1 line
1.7.2.30.gc37d7.dirty
#2 lore raw

Re: [PATCH 2/2] kconfig/conf: add command line options' description

Hi Folks,

Quoted 1 line · Arnaud Lacombe

[...]

That should be all for tonight. my kconfig queue is a bit smaller now. Michal, Sam, whoever read this mail, I allow you to hate me ;-)

ENEEDFOOD,
- Arnaud

#3 lore raw

Re: [PATCH 2/2] kconfig/conf: add command line options' description

In reply to Arnaud Lacombe

Hi,

Quoted 5 lines · Arnaud Lacombe

---
 scripts/kconfig/conf.c |   33 +++++++++++++++++++++++++++++++++

 1 files changed, 33 insertions(+), 0 deletions(-)

ping ?

- Arnaud

Quoted 61 lines
scripts/kconfig/conf.c +33 -1
index 057f49a..5297dbf 100644
@@ -468,8 +468,28 @@ static struct option long_opts[] = {
        {NULL, 0, NULL, 0}
  };
 
+static void conf_usage(const char *progname)
+{
+
+       printf("Usage: %s [option] <kconfig-file>\n", progname);
+       printf("Option is one of the following:\n");
+       printf("  --listnewconfig         List new options\n");
+       printf("  --oldaskconfig          Start a new configuration using a line-oriented program\n");
+       printf("  --oldconfig             Update a configuration using a provided .config as base\n");
+       printf("  --silentoldconfig       Same as oldconfig, but quietly, additionally update deps\n");
+       printf("  --oldnoconfig           Same as silentoldconfig but set new symbols to no\n");
+       printf("  --defconfig [arg]       New config with default defined in the kconfig-filedefconfig\n");
+       printf("  --savedefconfig <file>  Save the minimal current configuration to <file>\n");
+       printf("  --allnoconfig           New config where all options are answered with no\n");
+       printf("  --allyesconfig          New config where all options are answered with yes\n");
+       printf("  --allmodconfig          New config where all options are answered with mod\n");
+       printf("  --alldefconfig          New config with all symbols set to default\n");
+       printf("  --randconfig            New config with random answer to all options\n");
+}
+
  int main(int ac, char **av)
  {
+       const char *progname = av[0];
        int opt;
        const char *name;
        struct stat tmpstat;
@@ -503,10 +523,23 @@ int main(int ac, char **av)
                        srand(seed);
                        break;
                }
+               case oldaskconfig:
+               case oldconfig:
+               case allnoconfig:
+               case allyesconfig:
+               case allmodconfig:
+               case alldefconfig:
+               case listnewconfig:
+               case oldnoconfig:
+                       break;
+               default:
+                       conf_usage(progname);
+                       exit(1);
                }
        }
        if (ac == optind) {
                printf(_("%s: Kconfig file missing\n"), av[0]);
+               conf_usage(progname);
                exit(1);
        }
        name = av[optind];
--

1.7.2.30.gc37d7.dirty

#4 lore raw
In reply to Arnaud Lacombe

Hi,

Quoted 8 lines · Arnaud Lacombe

This is likely to break the swith statement if the one of the enum member ever reach 63 ('?').

---
 scripts/kconfig/conf.c |    4 ----

 1 files changed, 0 insertions(+), 4 deletions(-)

ping ?

- Arnaud

Quoted 19 lines
scripts/kconfig/conf.c +0 -5
index 8e33aa7..057f49a 100644
@@ -503,10 +503,6 @@ int main(int ac, char **av)
                        srand(seed);
                        break;
                }
-               case '?':
-                       fprintf(stderr, _("See README for usage info\n"));
-                       exit(1);
-                       break;
                }
        }
        if (ac == optind) {
--

1.7.2.30.gc37d7.dirty

#5 lore raw
In reply to Arnaud Lacombe
Quoted 13 lines · Arnaud Lacombe

This is likely to break the swith statement if the one of the enum member ever reach 63 ('?').

---
 scripts/kconfig/conf.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
scripts/kconfig/conf.c +0 -0
index 8e33aa7..057f49a 100644

scripts/kconfig/conf.c int main(int ac, char **av) · line 509

Quoted 7 lines
scripts/kconfig/conf.c +0 -4
@@ -503,10 +503,6 @@ int main(int ac, char **av)
 			srand(seed);
 			break;
 		}
-		case '?':
-			fprintf(stderr, _("See README for usage info\n"));
-			exit(1);
-			break;

This code is correct, getopt_long() returns '?' if it encounters an unknown option. At least the glibc implementation does so.

Michal