ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/cal/rcalc.c
(Generate patch)

Comparing ray/src/cal/rcalc.c (file contents):
Revision 1.14 by greg, Mon Oct 11 10:02:15 2004 UTC vs.
Revision 1.17 by greg, Wed Feb 16 17:20:22 2005 UTC

# Line 25 | Line 25 | static const char RCSid[] = "$Id$";
25  
26   #define  isblnk(c)      (igneol ? isspace(c) : (c)==' '||(c)=='\t')
27  
28 < #define  INBSIZ         4096    /* longest record */
28 > #define  INBSIZ         16384   /* longest record */
29   #define  MAXCOL         32      /* number of columns recorded */
30  
31                                  /* field type specifications */
# Line 210 | Line 210 | eputs(" [-b][-l][-n][-p][-w][-u][-tS][-s svar=sval][-e
210                  }
211  
212          if (noinput) {          /* produce a single output record */
213 +                if (i < argc) {
214 +                        eputs(argv[0]);
215 +                        eputs(": file argument(s) incompatible with -n\n");
216 +                        quit(1);
217 +                }
218                  eclock++;
219                  putout();
220                  quit(0);
# Line 634 | Line 639 | getrec(void)                           /* get next record from file */
639          register struct field  *f;
640  
641          while (ipb.chr != EOF) {
637 –                eatline = !igneol && ipb.chr != '\n';
642                  if (blnkeq)             /* beware of nbsynch() */
643                          while (isblnk(ipb.chr))
644                                  resetinp();
645 +                eatline = (!igneol && ipb.chr != '\n');
646                  clearrec();             /* start with fresh record */
647                  for (f = inpfmt; f != NULL; f = f->next)
648                          if (getfield(f) == -1)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines