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.24 by greg, Fri Jun 29 23:09:06 2012 UTC vs.
Revision 2.25 by greg, Tue Feb 2 18:02:32 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines