continue to recognize dot2gxl and gxl2dot as possible command names for automatic...

fix an unrelated crash

diff --git a/cmd/tools/cvtgxl.c b/cmd/tools/cvtgxl.c
index 487866c325a4d43c591bb081ae34b2f33b319a18..35a0a7501a0642e910a596acae4048c0366d9303 100644 (file)
--- a/cmd/tools/cvtgxl.c
+++ b/cmd/tools/cvtgxl.c
@@ -19,15 +19,15 @@
  * Written by Emden R. Gansner and Krishnam Pericherla 
  */
 
-#include <convert.h>
-
+#include <ctype.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #else
 #include "compat_getopt.h"
 #endif
 
-#include <ingraphs.h>
+#include "convert.h"
+#include "ingraphs.h"
 
 typedef enum { Unset, ToGV, ToGXL } mode;
 
@@ -123,20 +123,16 @@ static void checkInput(void)
 
 static void setAction(void)
 {
-    switch (*CmdName) {
-    case 'd':
-    case 'D':
+    if (tolower(CmdName[0]) == 'd') 
        act = ToGXL;
-       break;
-    case 'g':
-    case 'G':
-       act = ToGV;
-       break;
-    default:
-       if (Files)
-           checkInput();
-       break;
+    else if (tolower(CmdName[0]) == 'g') {
+       if (tolower(CmdName[1]) == 'v')
+           act = ToGXL;
+       else
+           act = ToGV;
     }
+    else if (Files)
+       checkInput();
 
     if (act == Unset) {
        fprintf(stderr, "Cannot determine conversion type\n");

diff --git a/cmd/tools/gv2gxl.c b/cmd/tools/gv2gxl.c
index 1e245d05bb814a34fdf11c618d98cd8e3f9cdf29..e2eccdd620414ba067a7e2d09a6c54e82266bd76 100644 (file)
--- a/cmd/tools/gv2gxl.c
+++ b/cmd/tools/gv2gxl.c
@@ -646,7 +646,7 @@ static void writePort(Agedge_t * e, FILE * gxlFile, char *name)
     char *val;
 
     val = agget(e, name);
-    if (val[0]) {
+    if (val && val[0]) {
        tabover(gxlFile);
        fprintf(gxlFile, "\t<attr name=\"%s\">\n", name);
        tabover(gxlFile);