From 7d9a3dced807f8505d591c5033eaf352c3b30e93 Mon Sep 17 00:00:00 2001
From: erg <devnull@localhost>
Date: Mon, 1 May 2006 22:26:32 +0000
Subject: [PATCH] Fix gvpack -u to do a simple merge of graphs, without
 requiring any position information; fix error reporting of unknown flag to
 correctly report the bad flag.

---
 cmd/tools/bcomps.c   |  2 +-
 cmd/tools/ccomps.c   |  2 +-
 cmd/tools/dijkstra.c |  2 +-
 cmd/tools/gvcolor.c  |  2 +-
 cmd/tools/gvpack.c   | 23 +++++++++++++----------
 cmd/tools/nop.c      |  2 +-
 cmd/tools/sccmap.c   |  2 +-
 cmd/tools/tred.c     |  2 +-
 8 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/cmd/tools/bcomps.c b/cmd/tools/bcomps.c
index 2f98e2c23..847b0c388 100644
--- a/cmd/tools/bcomps.c
+++ b/cmd/tools/bcomps.c
@@ -355,7 +355,7 @@ static void init(int argc, char *argv[])
 		usage(0);
 	    else
 		fprintf(stderr,
-			"bcomps: option -%c unrecognized - ignored\n", c);
+			"bcomps: option -%c unrecognized - ignored\n", optopt);
 	    break;
 	}
     }
diff --git a/cmd/tools/ccomps.c b/cmd/tools/ccomps.c
index f80157f61..b4848d34e 100644
--- a/cmd/tools/ccomps.c
+++ b/cmd/tools/ccomps.c
@@ -165,7 +165,7 @@ static void init(int argc, char *argv[])
 		usage(0);
 	    else
 		fprintf(stderr,
-			"ccomps: option -%c unrecognized - ignored\n", c);
+			"ccomps: option -%c unrecognized - ignored\n", optopt);
 	    break;
 	}
     }
diff --git a/cmd/tools/dijkstra.c b/cmd/tools/dijkstra.c
index e34f70333..a28c0d69b 100644
--- a/cmd/tools/dijkstra.c
+++ b/cmd/tools/dijkstra.c
@@ -231,7 +231,7 @@ static void init(int argc, char *argv[])
 		usage(0);
 	    else
 		fprintf(stderr, "%s: option -%c unrecognized - ignored\n",
-			CmdName, c);
+			CmdName, optopt);
 	    break;
 	}
     }
diff --git a/cmd/tools/gvcolor.c b/cmd/tools/gvcolor.c
index 08b656ac7..10ffb4d7e 100644
--- a/cmd/tools/gvcolor.c
+++ b/cmd/tools/gvcolor.c
@@ -108,7 +108,7 @@ static void init(int argc, char *argv[])
 		usage(0);
 	    else
 		fprintf(stderr, "gvcolor: option -%c unrecognized - ignored\n",
-			c);
+			optopt);
 	    break;
 	}
     }
diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c
index 6095f47e3..85965ce1b 100644
--- a/cmd/tools/gvpack.c
+++ b/cmd/tools/gvpack.c
@@ -77,6 +77,7 @@ static int G_sz;		/* Storage size for -G arguments */
 static attr_t *G_args;		/* Storage for -G arguments */
 
 #define NEWNODE(n) ((node_t*)ND_alg(n))
+#define DOPACK     (packMode != l_undef)
 
 static char *useString =
     "Usage: gvpack [-gnuv?] [-m<margin>] [-o<outf>] <files>\n\
@@ -199,7 +200,7 @@ static void init(int argc, char *argv[])
 		usage(0);
 	    else
 		fprintf(stderr,
-			"gvpack: option -%c unrecognized - ignored\n", c);
+			"gvpack: option -%c unrecognized - ignored\n", optopt);
 	    break;
 	}
     }
@@ -494,7 +495,8 @@ cloneSubg(Agraph_t * g, Agraph_t * ng, Agsym_t * G_bb, Dt_t * gnames)
     Agraph_t *nsubg;
 
     cloneGraphAttr(g, ng);
-    agxset(ng, G_bb->index, "");	/* Unset all subgraph bb */
+    if (DOPACK)
+	agxset(ng, G_bb->index, "");	/* Unset all subgraph bb */
 
     /* clone subgraphs */
     mg = g->meta_node->graph;
@@ -591,7 +593,7 @@ static Agraph_t *cloneGraph(Agraph_t ** gs, int cnt)
     root = agopen("root", kind);
     initAttrs(root, gs, cnt);
     G_bb = agfindattr(root, "bb");
-    assert(G_bb);
+    if (DOPACK) assert(G_bb);
 
     /* add command-line attributes */
     for (i = 0; i < G_cnt; i++) {
@@ -692,7 +694,7 @@ static Agraph_t **readGraphs(int *cp)
 	    exit(1);
 	} else if (!AG_IS_STRICT(g))
 	    kind = g->kind;
-	init_graph(g, TRUE);
+	init_graph(g, DOPACK);
 	gs[cnt++] = g;
     }
 
@@ -770,7 +772,7 @@ int main(int argc, char *argv[])
 	exit(0);
 
     /* pack graphs */
-    if (packMode != l_undef) {
+    if (DOPACK) {
 	pinfo.margin = margin;
 	pinfo.doSplines = doSplines;
 	pinfo.mode = packMode;
@@ -785,11 +787,12 @@ int main(int argc, char *argv[])
     g = cloneGraph(gs, cnt);
 
     /* compute new top-level bb and set */
-    bb = compBB(gs, cnt);
-    GD_bb(g) = bb;
-
-    dotneato_postprocess(g);
-    attach_attrs(g);
+    if (DOPACK) {
+	bb = compBB(gs, cnt);
+	GD_bb(g) = bb;
+	dotneato_postprocess(g);
+	attach_attrs(g);
+    }
     agwrite(g, outfp);
     exit(0);
 }
diff --git a/cmd/tools/nop.c b/cmd/tools/nop.c
index 40f7763c5..82e50f005 100644
--- a/cmd/tools/nop.c
+++ b/cmd/tools/nop.c
@@ -55,7 +55,7 @@ static void init(int argc, char *argv[])
 		usage(0);
 	    else
 		fprintf(stderr, "nop: option -%c unrecognized - ignored\n",
-			c);
+			optopt);
 	    break;
 	}
     }
diff --git a/cmd/tools/sccmap.c b/cmd/tools/sccmap.c
index 965cfd975..717d4ed8b 100644
--- a/cmd/tools/sccmap.c
+++ b/cmd/tools/sccmap.c
@@ -338,7 +338,7 @@ static void scanArgs(int argc, char **argv)
 		usage(0);
 	    else
 		fprintf(stderr, "%s: option -%c unrecognized - ignored\n",
-			CmdName, c);
+			CmdName, optopt);
 	    break;
 	}
     }
diff --git a/cmd/tools/tred.c b/cmd/tools/tred.c
index d01218b20..c75bd9059 100644
--- a/cmd/tools/tred.c
+++ b/cmd/tools/tred.c
@@ -109,7 +109,7 @@ static void init(int argc, char *argv[])
 		usage(0);
 	    else
 		fprintf(stderr, "%s: option -%c unrecognized - ignored\n",
-			CmdName, c);
+			CmdName, optopt);
 	    break;
 	}
     }
-- 
2.40.0