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

Diff Legend

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