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.23 by greg, Wed Oct 5 17:20:55 2011 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(), _mkdir(), etc. */
18  
22 #ifdef _WIN32
23
19    #define access _access
20 +  #define mkdir(dirname,perms) _mkdir(dirname)
21    #define PATH_MAX _MAX_PATH
22 +  #define NULL_DEVICE   "NUL"
23    #define DIRSEP                '/'
24    #define ISDIRSEP(c)   ((c)=='/' || (c)=='\\')
25    #define ISABS(s)      ((s)!=NULL \
# Line 34 | Line 31 | extern "C" {
31    #define CASEDIRSEP    case '/': case '\\'
32    #define PATHSEP               ';'
33    #define CURDIR                '.'
37  #define MAXPATH               512 /* XXX obsoleted by posix PATH_MAX */
34    #define DEFAULT_TEMPDIRS {"C:/TMP", "C:/TEMP", ".", NULL}
35    #define TEMPLATE      "rtXXXXXX"
36    #define TEMPLEN               8
# Line 45 | Line 41 | extern "C" {
41    /* <io.h> only does half the work for access() */
42    #ifndef F_OK
43      #define  F_OK 00
48    #define  X_OK 01
44      #define  W_OK 02
50    #define  R_OK 04
45    #endif
46 < extern char  *fixargv0();
46 >  #ifndef R_OK
47 >    #define X_OK 01
48 >    #define R_OK 04
49 >  #endif
50 >  /* to make the permissions user specific we'd need to use CreateFile() */
51 >  #ifndef S_IRUSR
52 >    #define S_IRUSR _S_IREAD
53 >    #define S_IWUSR _S_IWRITE
54 >  #endif
55  
56 < #else
57 <  #ifndef PATH_MAX /* doesn't implement posix? */
56 <    #define PATH_MAX 512 /* quite conservative (I think...) */
56 >  #ifdef __cplusplus
57 >    extern "C" {
58    #endif
59 +  extern char  *fixargv0();
60 +  #ifdef __cplusplus
61 +    }
62 +  #endif
63  
64 + #else /* everything but Windows */
65 +  #include <unistd.h>
66 +  #include <sys/param.h>
67 +
68 +  #define RMAX_PATH_MAX 4096 /* our own maximum */
69 +  #ifndef PATH_MAX
70 +    #define PATH_MAX 512
71 +  #elif PATH_MAX > RMAX_PATH_MAX /* the OS is exaggerating */
72 +    #undef PATH_MAX
73 +    #define PATH_MAX RMAX_PATH_MAX
74 +  #endif
75 +
76    #ifdef AMIGA
77  
78 +        #define NULL_DEVICE     "NIL:"
79      #define DIRSEP              '/'
80      #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
81      #define PATHSEP             ';'
82          #define CURDIR          '.'
65    #define MAXPATH             128
83      #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
84      #define TEMPLATE    "/tmp/rtXXXXXX"
85      #define TEMPLEN             13
# Line 74 | Line 91 | extern char  *fixargv0();
91  
92    #else
93  
94 +    /* posix */
95 +
96 +        /* this is defined as _PATH_DEVNULL in /usr/include/paths.h on Linux */
97 +        #define NULL_DEVICE     "/dev/null"
98      #define DIRSEP              '/'
99      #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
100      #define PATHSEP             ':'
101          #define CURDIR          '.'
81    #define MAXPATH             256
102      #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
103 <    #define TEMPLATE    "/usr/tmp/rtXXXXXX"
103 >    #define TEMPLATE    "/tmp/rtXXXXXX"
104      #define TEMPLEN             17
105      #define ULIBVAR             "RAYPATH"
106      #ifndef DEFPATH
# Line 98 | Line 118 | extern char  *fixargv0();
118    #define CASEDIRSEP    case DIRSEP
119   #endif
120  
121 < extern char  *mktemp(), *getenv();
122 <
103 < #ifdef BSD
104 < extern char  *getwd();
105 < #else
106 < extern char  *getcwd();
107 < #define  getwd(p)       getcwd(p, sizeof(p))
121 > #ifdef __cplusplus
122 > extern "C" {
123   #endif
124  
110
125   /* Find a writeable directory for temporary files */
126   /* If s is NULL, we return a static string */
127   extern char *temp_directory(char *s, size_t len);
# Line 122 | Line 136 | extern char *temp_filename(char *s, size_t len, char *
136   /* Same as above, but also open the file and return the descriptor */
137   /* This one is supposed to protect against race conditions on unix */
138   /* WARNING: On Windows, there's no protection against race conditions */
139 < extern int temp_file(char *s, size_t len, char *templ);
139 > extern int temp_fd(char *s, size_t len, char *templ);
140 >
141 > /* Same as above, but return a file pointer instead of a descriptor */
142 > extern FILE *temp_fp(char *s, size_t len, char *templ);
143  
144   /* Concatenate two strings, leaving exactly one DIRSEP in between */
145   extern char *append_filepath(char *s1, char *s2, size_t len);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines