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

Comparing ray/src/util/rad.c (file contents):
Revision 2.68 by schorsch, Thu Jul 3 22:41:45 2003 UTC vs.
Revision 2.69 by schorsch, Mon Jul 14 20:02:30 2003 UTC

# Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8   #include "standard.h"
9  
10   #include <ctype.h>
11 + #include <time.h>
12  
13   #include "platform.h"
14   #include "view.h"
15   #include "paths.h"
16   #include "vars.h"
17  
18 + #ifdef _WIN32
19 +  #define DELCMD "del"
20 +  #define RENAMECMD "rename"
21 + #else
22 +  #define DELCMD "rm -f"
23 +  #define RENAMECMD "mv"
24 + #endif
25 +
26                                  /* variables (alphabetical by name) */
27   #define AMBFILE         0               /* ambient file name */
28   #define DETAIL          1               /* level of scene detail */
# Line 80 | Line 89 | char   overfile[] = NULL_DEVICE;
89   char    overfile[] = "overture.unf";
90   #endif
91  
83 extern time_t   time();
92  
93   time_t  scenedate;              /* date of latest scene or object file */
94   time_t  octreedate;             /* date of octree */
# Line 1306 | Line 1314 | rmfile(fn)                     /* remove a file */
1314   char    *fn;
1315   {
1316          if (!silent)
1317 < #ifdef _WIN32
1310 <                printf("\tdel %s\n", fn);
1311 < #else
1312 <                printf("\trm -f %s\n", fn);
1313 < #endif
1317 >                printf("\t%s %s\n", DELCMD, fn);
1318          if (!nprocs)
1319                  return(0);
1320          return(unlink(fn));
# Line 1321 | Line 1325 | mvfile(fold, fnew)             /* move a file */
1325   char    *fold, *fnew;
1326   {
1327          if (!silent)
1328 < #ifdef _WIN32
1325 <                printf("\trename %s %s\n", fold, fnew);
1326 < #else
1327 <                printf("\tmv %s %s\n", fold, fnew);
1328 < #endif
1328 >                printf("\t%s %s %s\n", RENAMECMD, fold, fnew);
1329          if (!nprocs)
1330                  return(0);
1331          return(rename(fold, fnew));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines