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.19 by schorsch, Mon Jul 14 22:23:59 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines