Tweak getopt to handle -? correctly on various architectures

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index e3c55359c95d59a9d85ec69e96a23853b94d5b0d..cadcdb18f40d70b9f8d9b553c0237d5849ac320e 100644 (file)
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -19,7 +19,7 @@ pdfdir = $(pkgdatadir)/doc/pdf
 noinst_HEADERS = colortbl.h convert.h mmio.h matrix_market.h \
         graph_generator.h gml2gv.h gmlparse.h
 bin_PROGRAMS = gc gvcolor gxl2gv acyclic nop ccomps sccmap tred \
-       unflatten gvpack dijkstra bcomps mm2gv gvgen gml2gv
+       unflatten gvpack dijkstra bcomps mm2gv gvgen gml2gv gv2gml
 man_MANS = gc.1 gvcolor.1 gxl2gv.1 acyclic.1 nop.1 ccomps.1 sccmap.1 \
        tred.1 unflatten.1 gvpack.1 dijkstra.1 bcomps.1 mm2gv.1 gvgen.1 gml2gv.1
 pdf_DATA = gc.1.pdf gvcolor.1.pdf gxl2gv.1.pdf acyclic.1.pdf \
@@ -180,6 +180,12 @@ gml2gv_LDADD = \
 gml2gv.1.pdf: gml2gv.1
        - @GROFF@ -Tps -man gml2gv.1 | @PS2PDF@ - - >gml2gv.1.pdf
 
+gv2gml_SOURCES = gv2gml.c
+
+gv2gml_LDADD = \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
+       $(top_builddir)/lib/cgraph/libcgraph.la
+
 dijkstra_SOURCES = dijkstra.c
 
 dijkstra_LDADD = \

diff --git a/cmd/tools/acyclic.c b/cmd/tools/acyclic.c
index 0f1d29dd9eca02f0334d019386cbf38088537e9b..3d3493a14f2d82af0cda8483fb7070704b79fc2b 100644 (file)
--- a/cmd/tools/acyclic.c
+++ b/cmd/tools/acyclic.c
@@ -138,8 +138,8 @@ static void init(int argc, char *argv[])
     int c;
 
     cmd = argv[0];
-
-    while ((c = getopt(argc, argv, ":vno:?")) != -1)
+    opterr = 0;
+    while ((c = getopt(argc, argv, ":vno:")) != -1)
        switch (c) {
        case 'o':
            outFile = openFile(optarg, "w");

diff --git a/cmd/tools/bcomps.c b/cmd/tools/bcomps.c
index e73c5fc578ce4b2faed203a5c32c18cb7ec94278..26e15393a62ee82b0466ad9cfb7dd35660ebda40 100644 (file)
--- a/cmd/tools/bcomps.c
+++ b/cmd/tools/bcomps.c
@@ -340,7 +340,8 @@ static void init(int argc, char *argv[])
 {
     int c;
 
-    while ((c = getopt(argc, argv, ":o:xstv?")) != -1) {
+    opterr = 0;
+    while ((c = getopt(argc, argv, ":o:xstv")) != -1) {
        switch (c) {
        case 'o':
            outfile = optarg;

diff --git a/cmd/tools/ccomps.c b/cmd/tools/ccomps.c
index 2663d18bd225b82dbb4cba3351cba1fe040b83d7..7910ed1ed469eb96bf7c8a2a40d54cdc52af8d55 100644 (file)
--- a/cmd/tools/ccomps.c
+++ b/cmd/tools/ccomps.c
@@ -132,7 +132,8 @@ static void init(int argc, char *argv[])
 {
     int c;
 
-    while ((c = getopt(argc, argv, ":zo:xCX:nsv?")) != -1) {
+    opterr = 0;
+    while ((c = getopt(argc, argv, ":zo:xCX:nsv")) != -1) {
        switch (c) {
        case 'o':
            outfile = optarg;

diff --git a/cmd/tools/cvtgxl.c b/cmd/tools/cvtgxl.c
index 13bf7fba7e4eff88f0c75ea222c150fce6ef433e..fd62b30a07047f7716b8a93943aa5fed6ac9a12e 100644 (file)
--- a/cmd/tools/cvtgxl.c
+++ b/cmd/tools/cvtgxl.c
@@ -145,7 +145,8 @@ static void initargs(int argc, char **argv)
     int c;
 
     CmdName = cmdName(argv[0]);
-    while ((c = getopt(argc, argv, ":gdo:?")) != -1) {
+    opterr = 0;
+    while ((c = getopt(argc, argv, ":gdo:")) != -1) {
        switch (c) {
        case 'd':
            act = ToGV;

diff --git a/cmd/tools/dijkstra.c b/cmd/tools/dijkstra.c
index ed681fe9315ad305b64b03ec382268283fbd62b3..e87352b84fcd10bec24256152df1fa82a811b718 100644 (file)
--- a/cmd/tools/dijkstra.c
+++ b/cmd/tools/dijkstra.c
@@ -246,7 +246,8 @@ static void init(int argc, char *argv[])
     int i, j, c;
 
     CmdName = argv[0];
-    while ((c = getopt(argc, argv, ":ap?")) != -1) {
+    opterr = 0;
+    while ((c = getopt(argc, argv, ":ap")) != -1) {
        switch (c) {
        case 'a':
            setall = 1;

diff --git a/cmd/tools/gc.c b/cmd/tools/gc.c
index c69e515cda4a79ecfa33b821b540d6e43a537c18..749035e63c2d1df961fcb501791b6e40884dda29 100644 (file)
--- a/cmd/tools/gc.c
+++ b/cmd/tools/gc.c
@@ -94,7 +94,8 @@ static void init(int argc, char *argv[])
 {
     unsigned int c;
 
-    while ((c = getopt(argc, argv, ":necCaDUrsv?")) != -1) {
+    opterr = 0;
+    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 813816680dea76a54c5798c69d61cf5e486b09e9..f7466e7e0c19430660dd57915556f3408b93227e 100644 (file)
--- a/cmd/tools/gml2gv.c
+++ b/cmd/tools/gml2gv.c
@@ -106,7 +106,8 @@ static void initargs(int argc, char **argv)
     int c;
 
     CmdName = cmdName(argv[0]);
-    while ((c = getopt(argc, argv, ":gdo:?")) != -1) {
+    opterr = 0;
+    while ((c = getopt(argc, argv, ":gdo:")) != -1) {
        switch (c) {
        case 'o':
            outFile = openFile(optarg, "w");

diff --git a/cmd/tools/gvcolor.c b/cmd/tools/gvcolor.c
index 1a442aa0a2bd05ab55061a020883e03b1e0b4a41..38f58951e9fd935569bc7913ee93962a11618437 100644 (file)
--- a/cmd/tools/gvcolor.c
+++ b/cmd/tools/gvcolor.c
@@ -96,7 +96,8 @@ static void init(int argc, char *argv[])
 {
     int c;
 
-    while ((c = getopt(argc, argv, ":?")) != -1) {
+    opterr = 0;
+    while ((c = getopt(argc, argv, ":")) != -1) {
        switch (c) {
        case '?':
            if (optopt == '?')

diff --git a/cmd/tools/gvgen.c b/cmd/tools/gvgen.c
index 73b497f9d823d7f38b0b0d4f9a74b12eba777806..0a4bafaa31d93e9eb50db1d0ba19ae15af8df5b0 100644 (file)
--- a/cmd/tools/gvgen.c
+++ b/cmd/tools/gvgen.c
@@ -175,7 +175,7 @@ static char* setFold(char *s, opts_t* opts)
     return next;
 }
 
-static char *optList = ":c:C:dg:G:h:k:b:o:p:s:S:t:T:Vw:?";
+static char *optList = ":c:C:dg:G:h:k:b:o:p:s:S:t:T:Vw:";
 
 static GraphType init(int argc, char *argv[], opts_t* opts)
 {
@@ -183,6 +183,7 @@ static GraphType init(int argc, char *argv[], opts_t* opts)
     GraphType graphType = unknown;
 
     cmd = argv[0];
+    opterr = 0;
     while ((c = getopt(argc, argv, optList)) != -1) {
        switch (c) {
        case 'c':

diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c
index 0e6b0729fff1168701edea9607d25bdd38d6c2df..4c45374df2cecab5161a5f0a0e5c650c20885479 100644 (file)
--- a/cmd/tools/gvpack.c
+++ b/cmd/tools/gvpack.c
@@ -194,7 +194,8 @@ static void init(int argc, char *argv[], pack_info* pinfo)
     pinfo->doSplines = TRUE; /* Use edges in packing */
     pinfo->fixed = 0;
 
-    while ((c = getopt(argc, argv, ":na:gvum:o:G:?")) != -1) {
+    opterr = 0;
+    while ((c = getopt(argc, argv, ":na:gvum:o:G:")) != -1) {
        switch (c) {
        case 'a':
            len = strlen(optarg) + 2;

diff --git a/cmd/tools/matrix_market.c b/cmd/tools/matrix_market.c
index d96dc380453b514eed23c25ae751264aabbab860..b9a8f37e2f391fa657a7e4003dfb0dc48eb8fa68 100644 (file)
--- a/cmd/tools/matrix_market.c
+++ b/cmd/tools/matrix_market.c
@@ -17,7 +17,8 @@
 #include "SparseMatrix.h"
 #include "mmio.h"
 #include "matrix_market.h"
-#include "render.h"
+#include "memory.h"
+#include "assert.h"
 #define MALLOC gmalloc
 #define REALLOC grealloc
 #define FREE free

diff --git a/cmd/tools/mm2gv.c b/cmd/tools/mm2gv.c
index 762ac67d6572d02e1de7813cb81fe1bc4f04af05..60d51eb8cce8ef2201d0abea46e02fce0163809e 100644 (file)
--- a/cmd/tools/mm2gv.c
+++ b/cmd/tools/mm2gv.c
@@ -385,7 +385,8 @@ static void init(int argc, char **argv, parms_t* p)
     int c;
 
     cmd = argv[0];
-    while ((c = getopt(argc, argv, ":o:u?")) != -1) {
+    opterr = 0;
+    while ((c = getopt(argc, argv, ":o:u")) != -1) {
        switch (c) {
        case 'o':
            p->outf = openF (optarg, "w");

diff --git a/cmd/tools/nop.c b/cmd/tools/nop.c
index 67f62f0ac12a1b358bc80938384c83400d28e2c7..66c7433ae399faa48e7738023bbc195bb852b81c 100644 (file)
--- a/cmd/tools/nop.c
+++ b/cmd/tools/nop.c
@@ -50,7 +50,8 @@ static void init(int argc, char *argv[])
 {
     int c;
 
-    while ((c = getopt(argc, argv, ":p?")) != -1) {
+    opterr = 0;
+    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 562051450f2fb6551d03c2089dfe57ef721f8a40..0980e845c0600cc196d7a3eb82506da0c1f10642 100644 (file)
--- a/cmd/tools/sccmap.c
+++ b/cmd/tools/sccmap.c
@@ -347,7 +347,8 @@ static void scanArgs(int argc, char **argv)
     int c;
 
     CmdName = argv[0];
-    while ((c = getopt(argc, argv, ":o:sdvS?")) != EOF) {
+    opterr = 0;
+    while ((c = getopt(argc, argv, ":o:sdvS")) != EOF) {
        switch (c) {
        case 's':
            StatsOnly = 1;

diff --git a/cmd/tools/tred.c b/cmd/tools/tred.c
index cf1d0140e839778af79975b874c41827baa8e432..5c149debb3e52be2f6bfa7fc535ae1412afefcef 100644 (file)
--- a/cmd/tools/tred.c
+++ b/cmd/tools/tred.c
@@ -103,7 +103,8 @@ static void init(int argc, char *argv[])
     int c;
 
     CmdName = argv[0];
-    while ((c = getopt(argc, argv, ":?")) != -1) {
+    opterr = 0;
+    while ((c = getopt(argc, argv, ":")) != -1) {
        switch (c) {
        case '?':
            if (optopt == '?')

diff --git a/cmd/tools/unflatten.c b/cmd/tools/unflatten.c
index a2bdd74fa70037742652e0a2f61cb2dd23cd327a..ebb535c507f2f4c0928ec4c407318fbfbcde9ec9 100644 (file)
--- a/cmd/tools/unflatten.c
+++ b/cmd/tools/unflatten.c
@@ -179,8 +179,8 @@ static char **scanargs(int argc, char **argv)
     int c, ival;
 
     cmd = argv[0];
-
-    while ((c = getopt(argc, argv, ":fl:c:o:?")) != -1) {
+    opterr = 0;
+    while ((c = getopt(argc, argv, ":fl:c:o:")) != -1) {
        switch (c) {
        case 'f':
            Do_fans = 1;