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

Comparing ray/src/common/paths.h (file contents):
Revision 2.14 by schorsch, Thu Jun 26 00:58:09 2003 UTC vs.
Revision 2.18 by schorsch, Mon Jul 14 20:02:29 2003 UTC

# Line 8 | Line 8
8   extern "C" {
9   #endif
10  
11 < #include "copyright.h"
12 <
11 > #include <stdio.h>
12   #include <stdlib.h>
13   #include <string.h>
14 + #include <fcntl.h>
15 + #include <sys/types.h>
16 + #include <sys/stat.h>
17 +
18   #ifdef _WIN32
19    #include <io.h>
20 < #else /* _WIN32 */
18 <  #include <unistd.h>
19 <  #include <sys/param.h>
20 < #endif /* _WIN32 */
20 >  #include <direct.h> /* getcwd(), chdir(), etc. */
21  
22 #ifdef _WIN32
23
22    #define access _access
23    #define PATH_MAX _MAX_PATH
24    #define DIRSEP                '/'
# Line 34 | Line 32 | extern "C" {
32    #define CASEDIRSEP    case '/': case '\\'
33    #define PATHSEP               ';'
34    #define CURDIR                '.'
37  #define MAXPATH               512 /* XXX obsoleted by posix PATH_MAX */
35    #define DEFAULT_TEMPDIRS {"C:/TMP", "C:/TEMP", ".", NULL}
36    #define TEMPLATE      "rtXXXXXX"
37    #define TEMPLEN               8
# Line 49 | Line 46 | extern "C" {
46      #define  W_OK 02
47      #define  R_OK 04
48    #endif
49 +  /* to make the permissions user specific we'd need to use CreateFile() */
50 +  #ifndef S_IRUSR
51 +    #define S_IRUSR _S_IREAD
52 +    #define S_IWUSR _S_IWRITE
53 +  #endif
54   extern char  *fixargv0();
55  
56 < #else
57 <  #ifndef PATH_MAX /* doesn't implement posix? */
58 <    #define PATH_MAX 512 /* quite conservative (I think...) */
56 > #else /* everything but Windows */
57 >  #include <unistd.h>
58 >  #include <sys/param.h>
59 >
60 >  #define RMAX_PATH_MAX 4096 /* our own maximum */
61 >  #ifndef PATH_MAX
62 >    #define PATH_MAX 512
63 >  #elif PATH_MAX > RMAX_PATH_MAX /* the OS is exaggerating */
64 >    #undef PATH_MAX
65 >    #define PATH_MAX RMAX_PATH_MAX
66    #endif
67  
68    #ifdef AMIGA
# Line 62 | Line 71 | extern char  *fixargv0();
71      #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
72      #define PATHSEP             ';'
73          #define CURDIR          '.'
65    #define MAXPATH             128
74      #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
75      #define TEMPLATE    "/tmp/rtXXXXXX"
76      #define TEMPLEN             13
# Line 74 | Line 82 | extern char  *fixargv0();
82  
83    #else
84  
85 +    /* posix */
86 +
87 +        /* this is defined as _PATH_DEVNULL in /usr/include/paths.h on Linux */
88 +        #define NULL_DEVICE     "/dev/null"
89      #define DIRSEP              '/'
90      #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
91      #define PATHSEP             ':'
92          #define CURDIR          '.'
81    #define MAXPATH             256
93      #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
94      #define TEMPLATE    "/usr/tmp/rtXXXXXX"
95      #define TEMPLEN             17
# Line 98 | Line 109 | extern char  *fixargv0();
109    #define CASEDIRSEP    case DIRSEP
110   #endif
111  
101 extern char  *mktemp(), *getenv();
112  
103 #ifdef BSD
104 extern char  *getwd();
105 #else
106 extern char  *getcwd();
107 #define  getwd(p)       getcwd(p, sizeof(p))
108 #endif
109
110
113   /* Find a writeable directory for temporary files */
114   /* If s is NULL, we return a static string */
115   extern char *temp_directory(char *s, size_t len);
# Line 122 | Line 124 | extern char *temp_filename(char *s, size_t len, char *
124   /* Same as above, but also open the file and return the descriptor */
125   /* This one is supposed to protect against race conditions on unix */
126   /* WARNING: On Windows, there's no protection against race conditions */
127 < extern int temp_file(char *s, size_t len, char *templ);
127 > extern int temp_fd(char *s, size_t len, char *templ);
128 >
129 > /* Same as above, but return a file pointer instead of a descriptor */
130 > extern FILE *temp_fp(char *s, size_t len, char *templ);
131  
132   /* Concatenate two strings, leaving exactly one DIRSEP in between */
133   extern char *append_filepath(char *s1, char *s2, size_t len);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines