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

Comparing ray/src/meta/sort.c (file contents):
Revision 1.2 by schorsch, Sun Jun 8 12:03:10 2003 UTC vs.
Revision 1.6 by schorsch, Mon Jul 14 20:02:29 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *   Sorting routines for meta-files
6   */
7  
8 < #include  "paths.h"
8 > #include  "rtprocess.h" /* getpid() */
9 > #include  "rterror.h"
10   #include  "meta.h"
11  
12  
# Line 79 | Line 80 | int  (*pcmp)()         /* compares pointers to pointers to pr
80   */
81  
82   void
83 < mergesort(      /* merge sorted files with list */
83 > pmergesort(     /* merge sorted files with list */
84  
85   FILE  *fi[],            /* array of input files */
86   int  nf,                /* number of input files */
# Line 101 | Line 102 | FILE  *ofp             /* output file */
102  
103      for (i = 0; i < nf; i++) {          /* initialize input files */
104          if ((pp[i] = palloc()) == NULL)
105 <            error(SYSTEM, "memory exhausted in mergesort");
105 >            error(SYSTEM, "memory exhausted in pmergesort");
106          readp(pp[i], fi[i]);
107      }
108  
# Line 152 | Line 153 | int  (*pcmp)(),
153   FILE  *ofp
154   )
155   {
155 –    char  *tfname();
156      FILE  *fi[NFILES], *fp;
157      int  i;
158      
# Line 164 | Line 164 | FILE  *ofp
164          if ((fp = ofp) == NULL)
165              fp = efopen(tfname(height + 1, nt), "w");
166          
167 <        mergesort(fi, nf, pl, pcmp, fp);
167 >        pmergesort(fi, nf, pl, pcmp, fp);
168          
169          for (i = 0; i < nf; i++) {
170              fclose(fi[i]);
# Line 276 | Line 276 | int  lvl, int num
276   )
277   {
278          static char  pathbuf[PATH_MAX];
279 <    static char  fnbuf[32];
279 >    static char  fnbuf[PATH_MAX];
280 >        static size_t psiz;
281  
282 +        if (pathbuf[0] == '\0') { /* first time */
283 +                temp_directory(pathbuf, sizeof(pathbuf));
284 +                psiz = strlen(pathbuf);
285 +        }
286 +        snprintf(fnbuf, sizeof(pathbuf)-psiz,
287 +                        "%s/S%d%c%d", pathbuf, getpid(), lvl+'A', num);
288      /*sprintf(fnbuf, "%sS%d%c%d", TDIR, getpid(), lvl+'A', num);*/
282 –    sprintf(fnbuf, "%c%d_XXXXXX", lvl+'A', num);
283 –        temp_filename(pathbuf, sizeof(pathbuf), fnbuf);
289  
290 <    /*return(fnbuf);*/
286 <        return pathbuf;
290 >    return(fnbuf);
291   }

Diff Legend

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