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.19 by schorsch, Mon Jul 14 22:23:59 2003 UTC vs.
Revision 2.27 by schorsch, Sun Mar 6 01:13:17 2016 UTC

# Line 12 | Line 12
12   #include <sys/types.h>
13   #include <sys/stat.h>
14  
15 < #ifdef _WIN32
15 > #if defined(_WIN32) || defined(_WIN64)
16    #include <io.h>
17 <  #include <direct.h> /* getcwd(), chdir(), etc. */
17 >  #include <direct.h> /* getcwd(), chdir(), _mkdir(), etc. */
18 >  #define getcwd _getcwd
19 >  #define chdir _chdir
20  
21 <  #define access _access
22 <  #define PATH_MAX _MAX_PATH
21 >  #define access                _access
22 >  #define mkdir(dirname,perms)  _mkdir(dirname)
23 >  #ifdef _MSC_VER
24 >    #define popen(cmd,mode)     _popen(cmd,mode)
25 >    #define pclose(p)           _pclose(p)
26 >  #else
27 >    #define popen(cmd,mode)     win_popen(cmd,mode)
28 >    #define pclose(p)           win_pclose(p)
29 >  #endif
30 >  #define kill(pid,sig)         win_kill(pid,sig)
31 >  #define nice(inc)             win_nice(inc)
32 >  #define PATH_MAX              _MAX_PATH
33 >  #define NULL_DEVICE           "NUL"
34    #define DIRSEP                '/'
35 <  #define ISDIRSEP(c)   ((c)=='/' || (c)=='\\')
36 <  #define ISABS(s)      ((s)!=NULL \
37 <                  && (s[0])!='\0' \
38 <          && (   ISDIRSEP(s[0]) \
39 <              || (   (s[1])!='\0' \
27 <                  && (isupper(s[0])||islower(s[0])) \
28 <                  && (s[1])==':')))
29 <  #define CASEDIRSEP    case '/': case '\\'
35 >  #define ISDIRSEP(c)           (((c)=='/') | ((c)=='\\'))
36 >  #define ISABS(s)              ( ISDIRSEP((s)[0]) \
37 >                || ( isupper((s)[0]) | islower((s)[0]) \
38 >                        && (s)[1]==':' && ISDIRSEP((s)[2]) ) )
39 >  #define CASEDIRSEP            case '/': case '\\'
40    #define PATHSEP               ';'
41    #define CURDIR                '.'
42 <  #define DEFAULT_TEMPDIRS {"C:/TMP", "C:/TEMP", ".", NULL}
43 <  #define TEMPLATE      "rtXXXXXX"
42 >  #define DEFAULT_TEMPDIRS      {"C:/TMP", "C:/TEMP", ".", NULL}
43 >  #define TEMPLATE              "rtXXXXXX"
44    #define TEMPLEN               8
45    #define ULIBVAR               "RAYPATH"
46    #ifndef DEFPATH
47      #define DEFPATH             ";c:/ray/lib"
48    #endif
49 +  #define SPECIALS              " \t\"$*?|"
50 +  #define QUOTCHAR              '"'
51    /* <io.h> only does half the work for access() */
52    #ifndef F_OK
53      #define  F_OK 00
42    #define  X_OK 01
54      #define  W_OK 02
44    #define  R_OK 04
55    #endif
56 +  #ifndef R_OK
57 +    #define X_OK 01
58 +    #define R_OK 04
59 +  #endif
60    /* to make the permissions user specific we'd need to use CreateFile() */
61    #ifndef S_IRUSR
62      #define S_IRUSR _S_IREAD
63      #define S_IWUSR _S_IWRITE
64    #endif
65  
52  #ifdef __cplusplus
53    extern "C" {
54  #endif
55  extern char  *fixargv0();
56  #ifdef __cplusplus
57    }
58  #endif
59
66   #else /* everything but Windows */
67    #include <unistd.h>
68    #include <sys/param.h>
# Line 71 | Line 77
77  
78    #ifdef AMIGA
79  
80 +        #define NULL_DEVICE     "NIL:"
81      #define DIRSEP              '/'
82 <    #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
82 >    #define ISABS(s)            ISDIRSEP((s)[0])
83      #define PATHSEP             ';'
84          #define CURDIR          '.'
85 <    #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
86 <    #define TEMPLATE    "/tmp/rtXXXXXX"
85 >    #define DEFAULT_TEMPDIRS    {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
86 >    #define TEMPLATE            "/tmp/rtXXXXXX"
87      #define TEMPLEN             13
88      #define ULIBVAR             "RAYPATH"
89      #ifndef DEFPATH
# Line 91 | Line 98
98          /* this is defined as _PATH_DEVNULL in /usr/include/paths.h on Linux */
99          #define NULL_DEVICE     "/dev/null"
100      #define DIRSEP              '/'
101 <    #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
101 >    #define ISABS(s)            ISDIRSEP((s)[0])
102      #define PATHSEP             ':'
103          #define CURDIR          '.'
104 <    #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
105 <    #define TEMPLATE    "/usr/tmp/rtXXXXXX"
104 >    #define DEFAULT_TEMPDIRS    {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
105 >    #define TEMPLATE            "/tmp/rtXXXXXX"
106      #define TEMPLEN             17
107      #define ULIBVAR             "RAYPATH"
108      #ifndef DEFPATH
109        #define DEFPATH           ":/usr/local/lib/ray"
110      #endif
111 +    #define SPECIALS            " \t\n'\"()${}*?[];|&"
112 +    #define QUOTCHAR            '\''
113 +    #define ALTQUOT             '"'
114      #define      fixargv0(a0)   (a0)
115  
116    #endif
# Line 116 | Line 126
126   #ifdef __cplusplus
127   extern "C" {
128   #endif
129 +
130 + #if defined(_WIN32) || defined(_WIN64)
131 +  extern FILE *win_popen(char *command, char *type);
132 +  extern int win_pclose(FILE *p);
133 +  extern char  *fixargv0();
134 + #endif
135 +
136 + /* Check if any of the characters in str2 are found in str1 */
137 + extern int matchany(const char *str1, const char *str2);
138 +
139 + /* Convert a set of arguments into a command line for pipe() or system() */
140 + extern char *convert_commandline(char *cmd, const int len, char *av[]);
141  
142   /* Find a writeable directory for temporary files */
143   /* If s is NULL, we return a static string */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines