From a8a20bdd39d306d6f09d7eaba94c7082f0faa9ff Mon Sep 17 00:00:00 2001 From: "Emden R. Gansner" Date: Thu, 11 Jul 2013 11:05:39 -0400 Subject: [PATCH] Fix bug 2304; made similar mods to other tools. --- cmd/tools/bcomps.c | 5 ++++- cmd/tools/ccomps.c | 6 +++++- cmd/tools/cvtgxl.c | 5 ++++- cmd/tools/dijkstra.c | 2 +- cmd/tools/gc.c | 2 +- cmd/tools/gml2gv.c | 6 +++++- cmd/tools/graphml2gv.c | 6 +++++- cmd/tools/gv2gml.c | 9 +++++++-- cmd/tools/gvpack.c | 5 ++++- cmd/tools/mm2gv.c | 5 ++++- cmd/tools/nop.c | 2 +- cmd/tools/sccmap.c | 5 ++++- 12 files changed, 45 insertions(+), 13 deletions(-) diff --git a/cmd/tools/bcomps.c b/cmd/tools/bcomps.c index e3e41b43b..839be2f31 100644 --- a/cmd/tools/bcomps.c +++ b/cmd/tools/bcomps.c @@ -367,6 +367,9 @@ static void init(int argc, char *argv[]) case 'x': external = 1; break; + case ':': + fprintf(stderr, "bcomps: option -%c missing argument - ignored\n", optopt); + break; case '?': if (optopt == '?') usage(0); @@ -379,7 +382,7 @@ static void init(int argc, char *argv[]) argv += optind; argc -= optind; - if (argc) + if (argc > 0) Files = argv; } diff --git a/cmd/tools/ccomps.c b/cmd/tools/ccomps.c index 5a5207c7a..f07c263dd 100644 --- a/cmd/tools/ccomps.c +++ b/cmd/tools/ccomps.c @@ -206,6 +206,10 @@ static void init(int argc, char *argv[]) case 'z': sorted = 1; break; + case ':': + fprintf(stderr, + "ccomps: option -%c missing argument - ignored\n", optopt); + break; case '?': if (optopt == '?') usage(0); @@ -231,7 +235,7 @@ static void init(int argc, char *argv[]) else sorted = 0; /* not relevant; turn off */ } - if (argc) + if (argc > 0) Files = argv; } diff --git a/cmd/tools/cvtgxl.c b/cmd/tools/cvtgxl.c index 91b978b89..ba4b4465b 100644 --- a/cmd/tools/cvtgxl.c +++ b/cmd/tools/cvtgxl.c @@ -154,6 +154,9 @@ static void initargs(int argc, char **argv) case 'o': outFile = openFile(optarg, "w"); break; + case ':': + fprintf(stderr, "%s: option -%c missing argument\n", CmdName, optopt); + break; case '?': if (optopt == '?') usage(0); @@ -168,7 +171,7 @@ static void initargs(int argc, char **argv) argv += optind; argc -= optind; - if (argc) + if (argc > 0) Files = argv; if (!outFile) outFile = stdout; diff --git a/cmd/tools/dijkstra.c b/cmd/tools/dijkstra.c index 0300d74e5..b093f416f 100644 --- a/cmd/tools/dijkstra.c +++ b/cmd/tools/dijkstra.c @@ -262,7 +262,7 @@ static void init(int argc, char *argv[]) CmdName = argv[0]; opterr = 0; - while ((c = getopt(argc, argv, ":adp")) != -1) { + while ((c = getopt(argc, argv, "adp")) != -1) { switch (c) { case 'a': setall = 1; diff --git a/cmd/tools/gc.c b/cmd/tools/gc.c index 42b165183..d45b72931 100644 --- a/cmd/tools/gc.c +++ b/cmd/tools/gc.c @@ -100,7 +100,7 @@ static void init(int argc, char *argv[]) unsigned int c; opterr = 0; - while ((c = getopt(argc, argv, ":necCaDUrsv")) != -1) { + while ((c = getopt(argc, argv, "necCaDUrsv")) != -1) { switch (c) { case 'e': flags |= EDGES; diff --git a/cmd/tools/gml2gv.c b/cmd/tools/gml2gv.c index b972f593e..5301aec5b 100644 --- a/cmd/tools/gml2gv.c +++ b/cmd/tools/gml2gv.c @@ -128,13 +128,17 @@ static void initargs(int argc, char **argv) case 'o': outFile = openFile(optarg, "w"); break; + case ':': + fprintf(stderr, "%s: option -%c missing argument\n", CmdName, optopt); + usage(1); + break; case '?': if (optopt == '?') usage(0); else { fprintf(stderr, "%s: option -%c unrecognized\n", CmdName, optopt); - exit(1); + usage(1); } } } diff --git a/cmd/tools/graphml2gv.c b/cmd/tools/graphml2gv.c index 9ca10127d..fc51fdc0c 100644 --- a/cmd/tools/graphml2gv.c +++ b/cmd/tools/graphml2gv.c @@ -727,13 +727,17 @@ static void initargs(int argc, char **argv) case 'o': outFile = openFile(optarg, "w"); break; + case ':': + fprintf(stderr, "%s: option -%c missing argument\n", CmdName, optopt); + usage(1); + break; case '?': if (optopt == '?') usage(0); else { fprintf(stderr, "%s: option -%c unrecognized\n", CmdName, optopt); - exit(1); + usage(1); } } } diff --git a/cmd/tools/gv2gml.c b/cmd/tools/gv2gml.c index 7f3e882aa..e98f7c7ca 100644 --- a/cmd/tools/gv2gml.c +++ b/cmd/tools/gv2gml.c @@ -712,19 +712,24 @@ static void initargs(int argc, char **argv) CmdName = cmdName(argv[0]); opterr = 0; - while ((c = getopt(argc, argv, ":io:")) != -1) { + while ((c = getopt(argc, argv, ":o:")) != -1) { switch (c) { case 'o': outFile = openFile(optarg, "w"); break; + case ':': + fprintf(stderr, "%s: option -%c missing parameter\n", CmdName, optopt); + usage(1); + break; case '?': if (optopt == '?') usage(0); else { fprintf(stderr, "%s: option -%c unrecognized\n", CmdName, optopt); - exit(1); + usage(1); } + break; } } diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c index ab9b985f0..b085510dc 100644 --- a/cmd/tools/gvpack.c +++ b/cmd/tools/gvpack.c @@ -260,6 +260,9 @@ static void init(int argc, char *argv[], pack_info* pinfo) verbose = 1; Verbose = 1; break; + case ':': + fprintf(stderr, "gvpack: option -%c missing argument - ignored\n", optopt); + break; case '?': if (optopt == '?') usage(0); @@ -272,7 +275,7 @@ static void init(int argc, char *argv[], pack_info* pinfo) argv += optind; argc -= optind; - if (argc) { + if (argc > 0) { myFiles = argv; nGraphs = argc; /* guess one graph per file */ } else diff --git a/cmd/tools/mm2gv.c b/cmd/tools/mm2gv.c index a7e4e0c3b..4dfa4d983 100644 --- a/cmd/tools/mm2gv.c +++ b/cmd/tools/mm2gv.c @@ -439,6 +439,9 @@ static void init(int argc, char **argv, parms_t * p) } break; } + case ':': + fprintf(stderr, "%s: option -%c missing argument - ignored\n", cmd, optopt); + break; case '?': if (optopt == '?') usage(0); @@ -452,7 +455,7 @@ static void init(int argc, char **argv, parms_t * p) argv += optind; argc -= optind; - if (argc) { + if (argc > 0) { p->infile = argv[0]; p->inf = openF(argv[0], "r"); } diff --git a/cmd/tools/nop.c b/cmd/tools/nop.c index 1d37410f7..cb8ae3fa7 100644 --- a/cmd/tools/nop.c +++ b/cmd/tools/nop.c @@ -53,7 +53,7 @@ static void init(int argc, char *argv[]) int c; opterr = 0; - while ((c = getopt(argc, argv, ":p")) != -1) { + while ((c = getopt(argc, argv, "p")) != -1) { switch (c) { case 'p': chkOnly = 1; diff --git a/cmd/tools/sccmap.c b/cmd/tools/sccmap.c index 3a6d38196..e30904712 100644 --- a/cmd/tools/sccmap.c +++ b/cmd/tools/sccmap.c @@ -368,6 +368,9 @@ static void scanArgs(int argc, char **argv) Verbose = 0; Silent = 1; break; + case ':': + fprintf(stderr, "%s: option -%c missing argument - ignored\n", CmdName, optopt); + break; case '?': if (optopt == '?') usage(0); @@ -380,7 +383,7 @@ static void scanArgs(int argc, char **argv) argv += optind; argc -= optind; - if (argc) + if (argc > 0) Files = argv; if (!outfp) outfp = stdout; /* stdout the default */ -- 2.50.0