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

Comparing ray/src/hd/rhoptimize.c (file contents):
Revision 3.7 by gwlarson, Mon Feb 1 09:56:18 1999 UTC vs.
Revision 3.8 by greg, Sat Feb 22 02:07:25 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1999 Silicon Graphics, Inc. */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   * Optimize holodeck for quick access.
6   *
# Line 23 | Line 20 | char   tempfile[128];
20   int     dupchecking = 0;
21  
22   extern char     *rindex();
26 extern int      quit();
23   extern long     rhinitcopy();
24  
25  
# Line 68 | Line 64 | char   *argv[];
64          lastopos = 0L;                  /* copy sections one by one */
65          while (nextipos != 0L) {
66                                          /* set input position; get next */
67 <                lseek(hdfd[0], nextipos, 0);
67 >                lseek(hdfd[0], (off_t)nextipos, 0);
68                  read(hdfd[0], (char *)&nextipos, sizeof(nextipos));
69                                          /* get output position; set last */
70 <                thisopos = lseek(hdfd[1], 0L, 2);
70 >                thisopos = lseek(hdfd[1], (off_t)0L, 2);
71                  if (lastopos > 0L) {
72 <                        lseek(hdfd[1], lastopos, 0);
72 >                        lseek(hdfd[1], (off_t)lastopos, 0);
73                          write(hdfd[1], (char *)&thisopos, sizeof(thisopos));
74 <                        lseek(hdfd[1], 0L, 2);
74 >                        lseek(hdfd[1], (off_t)0L, 2);
75                  }
76                  lastopos = thisopos;
77                  thisopos = 0L;          /* write place holder */
# Line 107 | Line 103 | char   *infn, *outfn;
103                  sprintf(errmsg, "cannot open \"%s\" for reading", infn);
104                  error(SYSTEM, errmsg);
105          }
106 +        if (access(outfn, F_OK) == 0) {
107 +                sprintf(errmsg, "output file \"%s\" already exists!", outfn);
108 +                error(USER, errmsg);
109 +        }
110          if ((outfp = fopen(outfn, "w+")) == NULL) {
111                  sprintf(errmsg, "cannot open \"%s\" for writing", outfn);
112                  error(SYSTEM, errmsg);
# Line 220 | Line 220 | int    ifd, ofd;
220   }
221  
222  
223 + void
224   eputs(s)                        /* put error message to stderr */
225   register char  *s;
226   {
# Line 239 | Line 240 | register char  *s;
240   }
241  
242  
243 + void
244   quit(code)                      /* exit the program gracefully */
245   int     code;
246   {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines