[coreboot-gerrit] [S] Change in coreboot[master]: util/sconfig: Improve usage and long options

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/70524?usp=email )

Change subject: util/sconfig: Improve usage and long options
......................................................................

util/sconfig: Improve usage and long options

Move usage function closer to main(), remove excessive printf() calls,
use descriptive argument flags.

Signed-off-by: Jakub Czapiga 
Change-Id: If5252de63692c5e43bfbde4d7d93e1d7a84e8dff
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70524
Tested-by: build bot (Jenkins) 
Reviewed-by: Elyes Haouas 
---
M util/sconfig/main.c
1 file changed, 25 insertions(+), 24 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Elyes Haouas: Looks good to me, approved

diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index a246c01..2e6188f 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -1493,20 +1493,6 @@
    }
 }

-static void usage(void)
-{
-	printf("usage: sconfig <options>\n");
-	printf("  -c | --output_c          : Path to output static.c file (required)\n");
-	printf("  -r | --output_h          : Path to header static.h file (required)\n");
-	printf("  -d | --output_d          : Path to header static_devices.h file (required)\n");
-	printf("  -f | --output_f          : Path to header static_fw_config.h file (required)\n");
-	printf("  -m | --mainboard_devtree : Path to mainboard devicetree file (required)\n");
-	printf("  -o | --override_devtree  : Path to override devicetree file (optional)\n");
-	printf("  -p | --chipset_devtree   : Path to chipset/SOC devicetree file (optional)\n");
-
-	exit(1);
-}
-
 static void parse_devicetree(const char *file, struct bus *parent)
 {
    FILE *filec = fopen(file, "r");
@@ -1999,17 +1985,32 @@
    fprintf(f, "\n#endif /* __STATIC_FW_CONFIG_H */\n");
 }

+static void usage(const char *name)
+{
+	printf("Usage: %s <options>\n", name);
+	printf("Options:\n"
+	       "  -c | --output_c          : Path to output static.c file (required)\n"
+	       "  -r | --output_h          : Path to header static.h file (required)\n"
+	       "  -d | --output_d          : Path to header static_devices.h file (required)\n"
+	       "  -f | --output_f          : Path to header static_fw_config.h file (required)\n"
+	       "  -m | --mainboard_devtree : Path to mainboard devicetree file (required)\n"
+	       "  -o | --override_devtree  : Path to override devicetree file (optional)\n"
+	       "  -p | --chipset_devtree   : Path to chipset/SOC devicetree file (optional)\n");
+
+	exit(1);
+}
+
 int main(int argc, char **argv)
 {
    static const struct option long_options[] = {
-		{ "mainboard_devtree", 1, NULL, 'm' },
-		{ "override_devtree", 1, NULL, 'o' },
-		{ "chipset_devtree", 1, NULL, 'p' },
-		{ "output_c", 1, NULL, 'c' },
-		{ "output_h", 1, NULL, 'r' },
-		{ "output_d", 1, NULL, 'd' },
-		{ "output_f", 1, NULL, 'f' },
-		{ "help", 1, NULL, 'h' },
+		{ "mainboard_devtree", required_argument, NULL, 'm' },
+		{ "override_devtree", required_argument, NULL, 'o' },
+		{ "chipset_devtree", required_argument, NULL, 'p' },
+		{ "output_c", required_argument, NULL, 'c' },
+		{ "output_h", required_argument, NULL, 'r' },
+		{ "output_d", required_argument, NULL, 'd' },
+		{ "output_f", required_argument, NULL, 'f' },
+		{ "help", no_argument, NULL, 'h' },
    	{ }
    };
    const char *override_devtree = NULL;
@@ -2047,12 +2048,12 @@
    		break;
    	case 'h':
    	default:
-			usage();
+			usage(argv[0]);
    	}
    }

if (!base_devtree || !outputc || !outputh || !outputd || !outputf)
-		usage();
+		usage(argv[0]);

if (chipset_devtree) {
    	/* Use the chipset devicetree as the base, then override