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.13 by schorsch, Sun Jun 8 12:01:52 2003 UTC vs.
Revision 2.17 by schorsch, Thu Jul 3 22:41:44 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 < #ifdef _WIN32
15 < #include <io.h>
16 < #define access _access
18 < #define PATH_MAX _MAX_PATH
19 < #else /* _WIN32 */
20 < #include <unistd.h>
21 < #include <sys/param.h>
22 < #endif /* _WIN32 */
14 > #include <fcntl.h>
15 > #include <sys/types.h>
16 > #include <sys/stat.h>
17  
18   #ifdef _WIN32
19 +  #include <io.h>
20  
21 < #define DIRSEP          '/'
22 < #define ISDIRSEP(c)     ((c)=='/' || (c)=='\\')
23 < #define ISABS(s)        ((s)!=NULL \
24 <        && (s[0])!='\0' \
25 <        && (   ISDIRSEP(s[0]) \
26 <            || (   (s[1])!='\0' \
27 <                && (isupper(s[0])||islower(s[0])) \
28 <                && (s[1])==':')))
29 < #define CASEDIRSEP      case '/': case '\\'
30 < #define PATHSEP         ';'
31 < #define MAXPATH         128
32 < #define DEFAULT_TEMPDIRS {"C:/TMP", "C:/TEMP", ".", NULL}
33 < #define TEMPLATE        "rtXXXXXX"
34 < #define TEMPLEN         8
35 < #define ULIBVAR         "RAYPATH"
36 < #ifndef DEFPATH
37 < #define DEFPATH         ";c:/ray/lib"
38 < #endif
39 < /* <io.h> only does half the work for access() */
40 < #ifndef F_OK
41 < #define  F_OK 00
42 < #define  W_OK 02
43 < #define  R_OK 04
44 < #endif
21 >  #define access _access
22 >  #define PATH_MAX _MAX_PATH
23 >  #define DIRSEP                '/'
24 >  #define ISDIRSEP(c)   ((c)=='/' || (c)=='\\')
25 >  #define ISABS(s)      ((s)!=NULL \
26 >                  && (s[0])!='\0' \
27 >          && (   ISDIRSEP(s[0]) \
28 >              || (   (s[1])!='\0' \
29 >                  && (isupper(s[0])||islower(s[0])) \
30 >                  && (s[1])==':')))
31 >  #define CASEDIRSEP    case '/': case '\\'
32 >  #define PATHSEP               ';'
33 >  #define CURDIR                '.'
34 >  #define DEFAULT_TEMPDIRS {"C:/TMP", "C:/TEMP", ".", NULL}
35 >  #define TEMPLATE      "rtXXXXXX"
36 >  #define TEMPLEN               8
37 >  #define ULIBVAR               "RAYPATH"
38 >  #ifndef DEFPATH
39 >    #define DEFPATH             ";c:/ray/lib"
40 >  #endif
41 >  /* <io.h> only does half the work for access() */
42 >  #ifndef F_OK
43 >    #define  F_OK 00
44 >    #define  X_OK 01
45 >    #define  W_OK 02
46 >    #define  R_OK 04
47 >  #endif
48 >  /* to make the permissions user specific we'd need to use CreateFile() */
49 >  #ifndef S_IRUSR
50 >    #define S_IRUSR _S_IREAD
51 >    #define S_IWUSR _S_IWRITE
52 >  #endif
53   extern char  *fixargv0();
54  
55 < #else
56 < #ifdef AMIGA
55 > #else /* everything but Windows */
56 >  #include <unistd.h>
57 >  #include <sys/param.h>
58  
59 < #define DIRSEP          '/'
60 < #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
61 < #define PATHSEP         ';'
62 < #define MAXPATH         128
63 < #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
64 < #define TEMPLATE        "/tmp/rtXXXXXX"
65 < #define TEMPLEN         13
62 < #define ULIBVAR         "RAYPATH"
63 < #ifndef DEFPATH
64 < #define DEFPATH         ";/ray/lib"
65 < #endif
66 < #define  fixargv0(a0)   (a0)
59 >  #define RMAX_PATH_MAX 4096 /* our own maximum */
60 >  #ifndef PATH_MAX
61 >    #define PATH_MAX 512
62 >  #elif PATH_MAX > RMAX_PATH_MAX /* the OS is exaggerating */
63 >    #undef PATH_MAX
64 >    #define PATH_MAX RMAX_PATH_MAX
65 >  #endif
66  
67 < #else
67 >  #ifdef AMIGA
68  
69 < #define DIRSEP          '/'
70 < #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
71 < #define PATHSEP         ':'
72 < #define MAXPATH         256
73 < #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
74 < #define TEMPLATE        "/usr/tmp/rtXXXXXX"
75 < #define TEMPLEN         17
76 < #define ULIBVAR         "RAYPATH"
77 < #ifndef DEFPATH
78 < #define DEFPATH         ":/usr/local/lib/ray"
79 < #endif
80 < #define  fixargv0(a0)   (a0)
69 >    #define DIRSEP              '/'
70 >    #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
71 >    #define PATHSEP             ';'
72 >        #define CURDIR          '.'
73 >    #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
74 >    #define TEMPLATE    "/tmp/rtXXXXXX"
75 >    #define TEMPLEN             13
76 >    #define ULIBVAR             "RAYPATH"
77 >    #ifndef DEFPATH
78 >      #define DEFPATH           ";/ray/lib"
79 >    #endif
80 >    #define      fixargv0(a0)   (a0)
81  
82 +  #else
83 +
84 +    /* posix */
85 +
86 +        /* this is defined as _PATH_DEVNULL in /usr/include/paths.h on Linux */
87 +        #define NULL_DEVICE     "/dev/null"
88 +    #define DIRSEP              '/'
89 +    #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
90 +    #define PATHSEP             ':'
91 +        #define CURDIR          '.'
92 +    #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
93 +    #define TEMPLATE    "/usr/tmp/rtXXXXXX"
94 +    #define TEMPLEN             17
95 +    #define ULIBVAR             "RAYPATH"
96 +    #ifndef DEFPATH
97 +      #define DEFPATH           ":/usr/local/lib/ray"
98 +    #endif
99 +    #define      fixargv0(a0)   (a0)
100 +
101 +  #endif
102   #endif
84 – #endif
103  
104   #ifndef ISDIRSEP
105 < #define ISDIRSEP(c)     ((c)==DIRSEP)
105 >  #define ISDIRSEP(c)   ((c)==DIRSEP)
106   #endif
107   #ifndef CASEDIRSEP
108 < #define CASEDIRSEP      case DIRSEP
108 >  #define CASEDIRSEP    case DIRSEP
109   #endif
110  
93 – extern char  *mktemp(), *getenv();
111  
95 – #ifdef BSD
96 – extern char  *getwd();
97 – #else
98 – extern char  *getcwd();
99 – #define  getwd(p)       getcwd(p, sizeof(p))
100 – #endif
101 –
102 –
112   /* Find a writeable directory for temporary files */
113   /* If s is NULL, we return a static string */
114   extern char *temp_directory(char *s, size_t len);
# Line 114 | Line 123 | extern char *temp_filename(char *s, size_t len, char *
123   /* Same as above, but also open the file and return the descriptor */
124   /* This one is supposed to protect against race conditions on unix */
125   /* WARNING: On Windows, there's no protection against race conditions */
126 < extern int temp_file(char *s, size_t len, char *templ);
126 > extern int temp_fd(char *s, size_t len, char *templ);
127 >
128 > /* Same as above, but return a file pointer instead of a descriptor */
129 > extern FILE *temp_fp(char *s, size_t len, char *templ);
130  
131   /* Concatenate two strings, leaving exactly one DIRSEP in between */
132   extern char *append_filepath(char *s1, char *s2, size_t len);

Diff Legend

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