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

Comparing ray/src/common/header.c (file contents):
Revision 2.1 by greg, Tue Nov 12 16:54:24 1991 UTC vs.
Revision 2.3 by greg, Thu Nov 12 16:20:09 1992 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1991 Regents of the University of California */
1 > /* Copyright (c) 1992 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 9 | Line 9 | static char SCCSid[] = "$SunId$ LBL";
9   *
10   *      8/19/88
11   *
12 < *  printargs(ac,av,fp) print an argument list to fp, followed by '\n'
12 > *  printargs(ac,av,fp) print an argument list to fp, followed by '\n'
13   *  isformat(s)         returns true if s is of the form "FORMAT=*"
14   *  formatval(r,s)      copy the format value in s to r
15   *  fputformat(s,fp)    write "FORMAT=%s" to fp
# Line 22 | Line 22 | static char SCCSid[] = "$SunId$ LBL";
22   #include  <stdio.h>
23   #include  <ctype.h>
24  
25 < #define  MAXLINE        512
25 > #define  MAXLINE        512
26  
27 + #ifndef BSD
28 + #define  index  strchr
29 + #endif
30 +
31 + extern char  *index();
32 +
33   char  FMTSTR[] = "FORMAT=";
34   int  FMTSTRL = 7;
35  
# Line 31 | Line 37 | int  FMTSTRL = 7;
37   printargs(ac, av, fp)           /* print arguments to a file */
38   int  ac;
39   char  **av;
40 < FILE  *fp;
40 > register FILE  *fp;
41   {
42 +        int  quote;
43 +
44          while (ac-- > 0) {
45 <                fputs(*av++, fp);
45 >                if (index(*av, ' ') != NULL) {          /* quote it */
46 >                        if (index(*av, '\'') != NULL)
47 >                                quote = '"';
48 >                        else
49 >                                quote = '\'';
50 >                        putc(quote, fp);
51 >                        fputs(*av++, fp);
52 >                        putc(quote, fp);
53 >                } else
54 >                        fputs(*av++, fp);
55                  putc(' ', fp);
56          }
57          putc('\n', fp);
# Line 80 | Line 97 | char  *p;
97  
98          for ( ; ; ) {
99                  buf[MAXLINE-2] = '\n';
100 <                if (fgets(buf, sizeof(buf), fp) == NULL)
100 >                if (fgets(buf, MAXLINE, fp) == NULL)
101                          return(-1);
102                  if (buf[0] == '\n')
103                          return(0);
104 + #ifdef MSDOS
105 +                if (buf[0] == '\r' && buf[1] == '\n')
106 +                        return(0);
107 + #endif
108                  if (buf[MAXLINE-2] != '\n') {
109                          ungetc(buf[MAXLINE-2], fp);     /* prevent false end */
110                          buf[MAXLINE-2] = '\0';

Diff Legend

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