fix: reinstated interpretation of NULL file name as stdin, so dctimes…

…tep works
LBNL-ETA · Jan 22, 2021 · 7cc1bd2 · 7cc1bd2
1 parent 5529d7a
commit 7cc1bd2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/util/cmatrix.c b/src/util/cmatrix.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: cmatrix.c,v 2.32 2021/01/19 23:32:00 greg Exp $";
+static const char RCSid[] = "$Id: cmatrix.c,v 2.33 2021/01/22 16:19:15 greg Exp $";
 #endif
 /*
  * Color matrix routines.
@@ -219,11 +219,13 @@ cm_load(const char *inspec, int nrows, int ncols, int dtype)
 	COLOR		scale;
 	CMATRIX		*cm;
 
-	if (!inspec || !*inspec)
+	if (!inspec)
+		inspec = stdin_name;
+	else if (!*inspec)
 		return(NULL);
-	if (inspec == stdin_name)
+	if (inspec == stdin_name) {		/* reading from stdin? */
 		fp = stdin;
-	else if (inspec[0] == '!') {
+	} else if (inspec[0] == '!') {
 		fp = popen(inspec+1, "r");
 		if (!fp) {
 			sprintf(errmsg, "cannot start command '%s'", inspec);

diff --git a/src/util/rmatrix.c b/src/util/rmatrix.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.46 2021/01/19 23:32:00 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.47 2021/01/22 16:19:15 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -209,7 +209,9 @@ rmx_load(const char *inspec, RMPref rmp)
 	RMATRIX		dinfo;
 	RMATRIX		*dnew;
 
-	if (!inspec || !*inspec)
+	if (!inspec)
+		inspec = stdin_name;
+	else if (!*inspec)
 		return(NULL);
 	if (inspec == stdin_name) {		/* reading from stdin? */
 		fp = stdin;