--- ray/src/common/badarg.c	2014/02/28 21:03:40	2.8
+++ ray/src/common/badarg.c	2014/03/07 17:32:12	2.11
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: badarg.c,v 2.8 2014/02/28 21:03:40 greg Exp $";
+static const char	RCSid[] = "$Id: badarg.c,v 2.11 2014/03/07 17:32:12 greg Exp $";
 #endif
 /*
  * Check argument list against format string.
@@ -34,11 +34,12 @@ char	*fl
 		case 's':		/* string */
 			while (isspace(*s))
 				++s;
-			if (*s == '\0')
-				return(i);
-			while (*s)
-				if (!isprint(*s++))
-					return(i);
+                        if (!isprint(*s))
+                                return(i);
+                        while (isprint(*s) | isspace(*s))
+                                ++s;
+                        if (*s)
+                                return(i);
 			break;
 		case 'i':		/* integer */
 			if (!isintd(s, " \t\r\n"))