mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-07-25 18:19:00 +02:00
(main): Use getopt_long rather than getopt.
This commit is contained in:
+1
-1
@@ -103,7 +103,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "+") != -1)
|
||||
if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (argc < optind + 1)
|
||||
|
||||
+1
-1
@@ -76,7 +76,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "+") != -1)
|
||||
if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
|
||||
usage (EXIT_FAIL);
|
||||
|
||||
if (argc <= optind)
|
||||
|
||||
+1
-1
@@ -298,7 +298,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
have_read_stdin = false;
|
||||
|
||||
@@ -1447,7 +1447,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
/* Don't close stdout on exit from here on. */
|
||||
|
||||
+1
-1
@@ -78,7 +78,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "+") != -1)
|
||||
if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (argc < optind + 1)
|
||||
|
||||
+1
-1
@@ -202,7 +202,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (argc <= optind)
|
||||
|
||||
+1
-1
@@ -74,7 +74,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (optind < argc)
|
||||
|
||||
+1
-1
@@ -91,7 +91,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (argc == optind + 1)
|
||||
|
||||
+1
-1
@@ -74,7 +74,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (argc < optind + 2)
|
||||
|
||||
+1
-1
@@ -68,7 +68,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (optind < argc)
|
||||
|
||||
+1
-1
@@ -87,7 +87,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "+") != -1)
|
||||
if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (argc <= optind)
|
||||
|
||||
+1
-1
@@ -91,7 +91,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "+") != -1)
|
||||
if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
|
||||
usage (PRINTENV_FAILURE);
|
||||
|
||||
if (optind >= argc)
|
||||
|
||||
@@ -306,7 +306,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (optind < argc)
|
||||
|
||||
+1
-1
@@ -86,7 +86,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "+") != -1)
|
||||
if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
|
||||
usage (SETUIDGID_FAILURE);
|
||||
|
||||
if (argc <= optind + 1)
|
||||
|
||||
+1
-1
@@ -113,7 +113,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (argc == 1)
|
||||
|
||||
+1
-1
@@ -67,7 +67,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (optind < argc)
|
||||
|
||||
+1
-1
@@ -552,7 +552,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
have_read_stdin = false;
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (argc < optind + 1)
|
||||
|
||||
+1
-1
@@ -219,7 +219,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
switch (argc - optind)
|
||||
|
||||
+1
-1
@@ -135,7 +135,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
switch (argc - optind)
|
||||
|
||||
+1
-1
@@ -76,7 +76,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "") != -1)
|
||||
if (getopt_long (argc, argv, "", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (optind != argc)
|
||||
|
||||
@@ -73,7 +73,7 @@ main (int argc, char **argv)
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt (argc, argv, "+") != -1)
|
||||
if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
|
||||
if (argc <= optind)
|
||||
|
||||
Reference in New Issue
Block a user