--- ray/src/util/rfluxmtx.c 2015/09/13 21:09:20 2.31 +++ ray/src/util/rfluxmtx.c 2016/02/02 01:43:24 2.33 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rfluxmtx.c,v 2.31 2015/09/13 21:09:20 greg Exp $"; +static const char RCSid[] = "$Id: rfluxmtx.c,v 2.33 2016/02/02 01:43:24 greg Exp $"; #endif /* * Calculate flux transfer matrix or matrices using rcontrib @@ -201,10 +201,8 @@ convert_commandline(char *cmd, const int len, char *av for (cp = cmd; *av != NULL; av++) { const int n = strlen(*av); - if (cp+n >= cmd+(len-3)) { - fputs(progname, stderr); + if (cp+n >= cmd+(len-3)) return(NULL); - } if (matchany(*av, SPECIALS)) { const int quote = #ifdef ALTQUOT @@ -329,6 +327,7 @@ parse_params(PARAMS *p, char *pargs) { char *cp = pargs; int nparams = 0; + int quot; int i; for ( ; ; ) { @@ -365,14 +364,23 @@ parse_params(PARAMS *p, char *pargs) case 'o': if (*cp++ != '=') break; + quot = 0; + if ((*cp == '"') | (*cp == '\'')) + quot = *cp++; i = 0; - while (*cp && !isspace(*cp++)) - i++; + while (*cp && (quot ? (*cp != quot) : !isspace(*cp))) { + i++; cp++; + } if (!i) break; - *--cp = '\0'; + if (!*cp) { + if (quot) + break; + cp[1] = '\0'; + } + *cp = '\0'; p->outfn = savqstr(cp-i); - *cp++ = ' '; + *cp++ = quot ? quot : ' '; ++nparams; continue; case ' ':