--- ray/src/common/badarg.c 2003/02/22 02:07:21 2.2
+++ ray/src/common/badarg.c 2014/02/28 21:03:40 2.8
@@ -1,97 +1,51 @@
#ifndef lint
-static const char RCSid[] = "$Id: badarg.c,v 2.2 2003/02/22 02:07:21 greg Exp $";
+static const char RCSid[] = "$Id: badarg.c,v 2.8 2014/02/28 21:03:40 greg Exp $";
#endif
/*
* Check argument list against format string.
*
- * External symbols declared in standard.h
+ * External symbols declared in rtio.h
*/
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes Radiance software
- * (http://radsite.lbl.gov/)
- * developed by the Lawrence Berkeley National Laboratory
- * (http://www.lbl.gov/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- * and "The Regents of the University of California" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- * nor may "Radiance" appear in their name, without prior written
- * permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory. For more
- * information on Lawrence Berkeley National Laboratory, please see
- * .
- */
+#include "copyright.h"
#include
-#define NULL 0
+#include "rtio.h"
+
int
-badarg(ac, av, fl) /* check argument list */
-int ac;
-register char **av;
-register char *fl;
+badarg( /* check argument list */
+int ac,
+char **av,
+char *fl
+)
{
- register int i;
+ int i;
+ char *s;
if (fl == NULL)
fl = ""; /* no arguments? */
for (i = 1; *fl; i++,av++,fl++) {
if (i > ac || *av == NULL)
return(-1);
+ s = *av;
switch (*fl) {
case 's': /* string */
- if (**av == '\0' || isspace(**av))
+ while (isspace(*s))
+ ++s;
+ if (*s == '\0')
return(i);
+ while (*s)
+ if (!isprint(*s++))
+ return(i);
break;
case 'i': /* integer */
- if (!isintd(*av, " \t\r\n"))
+ if (!isintd(s, " \t\r\n"))
return(i);
break;
case 'f': /* float */
- if (!isfltd(*av, " \t\r\n"))
+ if (!isfltd(s, " \t\r\n"))
return(i);
break;
default: /* bad call! */