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.4 by greg, Sun Feb 27 10:16:45 1994 UTC vs.
Revision 2.10 by gwlarson, Tue Oct 27 08:44:28 1998 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1994 Regents of the University of California */
1 > /* Copyright (c) 1996 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 17 | Line 17 | static char SCCSid[] = "$SunId$ LBL";
17   *  formatval(r,s)      copy the format value in s to r
18   *  fputformat(s,fp)    write "FORMAT=%s" to fp
19   *  getheader(fp,f,p)   read header from fp, calling f(s,p) on each line
20 + *  globmatch(pat, str) check for glob match of str against pat
21   *  checkheader(i,p,o)  check header format from i against p and copy to o
22   *
23   *  To copy header from input to output, use getheader(fin, fputs, fout)
# Line 48 | Line 49 | register FILE  *fp;
49   }
50  
51  
52 + int
53   headidval(r,s)                  /* get header id (return true if is id) */
54   register char  *r, *s;
55   {
# Line 55 | Line 57 | register char  *r, *s;
57  
58          while (*cp) if (*cp++ != *s++) return(0);
59          if (r == NULL) return(1);
60 <        while (*s) *r++ = *s++;
60 >        while (*s && !isspace(*s)) *r++ = *s++;
61          *r = '\0';
62          return(1);
63   }
64  
65  
66 + int
67   isheadid(s)                     /* check to see if line is header id */
68   char  *s;
69   {
# Line 86 | Line 89 | register FILE  *fp;
89                          putc(quote, fp);
90                  } else
91                          fputs(*av++, fp);
92 <                putc(' ', fp);
92 >                putc(ac ? ' ' : '\n', fp);
93          }
91 –        putc('\n', fp);
94   }
95  
96  
97 + int
98   formatval(r, s)                 /* get format value (return true if format) */
99   register char  *r;
100   register char  *s;
# Line 102 | Line 105 | register char  *s;
105          while (isspace(*s)) s++;
106          if (!*s) return(0);
107          if (r == NULL) return(1);
108 <        while(*s) *r++ = *s++;
109 <        while (isspace(r[-1])) r--;
108 >        do
109 >                *r++ = *s++;
110 >        while(*s && !isspace(*s));
111          *r = '\0';
112          return(1);
113   }
114  
115  
116 + int
117   isformat(s)                     /* is line a format line? */
118   char  *s;
119   {
# Line 126 | Line 131 | FILE  *fp;
131   }
132  
133  
134 + int
135   getheader(fp, f, p)             /* get header from file */
136   FILE  *fp;
137   int  (*f)();
# Line 147 | Line 153 | char  *p;
153                          ungetc(buf[MAXLINE-2], fp);     /* prevent false end */
154                          buf[MAXLINE-2] = '\0';
155                  }
156 <                if (f != NULL)
157 <                        (*f)(buf, p);
156 >                if (f != NULL && (*f)(buf, p) < 0)
157 >                        return(-1);
158          }
159   }
160  
# Line 169 | Line 175 | register struct check  *cp;
175   }
176  
177  
178 < /*
179 < * Copymatch(pat,str) checks pat for wildcards, and
174 < * copies str into pat if there is a match (returning true).
175 < */
176 <
177 < #ifdef COPYMATCH
178 < copymatch(pat, str)
178 > int
179 > globmatch(pat, str)             /* check for glob match of str against pat */
180   char    *pat, *str;
181   {
181 –        int     docopy = 0;
182          register char   *p = pat, *s = str;
183  
184          do {
# Line 186 | Line 186 | char   *pat, *str;
186                  case '?':                       /* match any character */
187                          if (!*s++)
188                                  return(0);
189 –                        docopy++;
189                          break;
190                  case '*':                       /* match any string */
191                          while (p[1] == '*') p++;
192                          do
193 <                                if ( (p[1]=='?' || p[1]==*s)
194 <                                                && copymatch(p+1,s) ) {
196 <                                        strcpy(pat, str);
193 >                                if ( (p[1]=='?' || p[1]==*s) &&
194 >                                                globmatch(p+1,s) )
195                                          return(1);
198 –                                }
196                          while (*s++);
197                          return(0);
198                  case '\\':                      /* literal next */
# Line 208 | Line 205 | char   *pat, *str;
205                          break;
206                  }
207          } while (*p++);
211 –        if (docopy)
212 –                strcpy(pat, str);
208          return(1);
209   }
215 – #else
216 – #define copymatch(pat, s)       (!strcmp(pat, s))
217 – #endif
210  
211  
212   /*
# Line 225 | Line 217 | char   *pat, *str;
217   * if any input format is found (or there is an error), and 0 otherwise.
218   * If fmt contains any '*' or '?' characters, then checkheader
219   * does wildcard expansion and copies a matching result into fmt.
220 < * Be sure that fmt is big enough to hold the match in such cases!
220 > * Be sure that fmt is big enough to hold the match in such cases,
221 > * and that it is not a static, read-only string!
222   * The input header (minus any format lines) is copied to fout
223   * if fout is not NULL.
224   */
225  
226 + int
227   checkheader(fin, fmt, fout)
228   FILE  *fin;
229   char  *fmt;
230   FILE  *fout;
231   {
232          struct check    cdat;
233 +        register char   *cp;
234  
235          cdat.fp = fout;
236          cdat.fs[0] = '\0';
237          if (getheader(fin, mycheck, &cdat) < 0)
238                  return(-1);
239 <        if (cdat.fs[0] != '\0')
240 <                return(copymatch(fmt, cdat.fs) ? 1 : -1);
241 <        return(0);
239 >        if (!cdat.fs[0])
240 >                return(0);
241 >        for (cp = fmt; *cp; cp++)               /* check for globbing */
242 >                if (*cp == '?' | *cp == '*')
243 >                        if (globmatch(fmt, cdat.fs)) {
244 >                                strcpy(fmt, cdat.fs);
245 >                                return(1);
246 >                        } else
247 >                                return(-1);
248 >        return(strcmp(fmt, cdat.fs) ? -1 : 1);  /* literal match */
249   }

Diff Legend

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