--- ray/src/common/paths.h	2012/06/29 23:09:06	2.24
+++ ray/src/common/paths.h	2017/07/10 20:15:18	2.30
@@ -1,4 +1,4 @@
-/* RCSid $Id: paths.h,v 2.24 2012/06/29 23:09:06 greg Exp $ */
+/* RCSid $Id: paths.h,v 2.30 2017/07/10 20:15:18 greg Exp $ */
 /*
  * Definitions for paths on different machines
  */
@@ -12,29 +12,45 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
   #include <io.h>
   #include <direct.h> /* getcwd(), chdir(), _mkdir(), etc. */
+  #define getcwd _getcwd
+  #define chdir _chdir
 
-  #define access _access
-  #define mkdir(dirname,perms) _mkdir(dirname)
-  #define PATH_MAX _MAX_PATH
-  #define NULL_DEVICE	"NUL"
+  #define access		_access
+  #define mkdir(dirname,perms)	_mkdir(dirname)
+  /* The windows _popen with the native shell breaks '\\\n' escapes.
+   * RT_WINPROC (used by SCons) enables our replacement functions to fix that.
+   * XXX This should really not depend on the compiler used! */
+  #if defined(_MSC_VER) && !defined(RT_WINPROC)
+    #define popen(cmd,mode)	_popen(cmd,mode)
+    #define pclose(p)		_pclose(p)
+  #else
+    #define popen(cmd,mode)	win_popen(cmd,mode)
+    #define pclose(p)		win_pclose(p)
+  #endif
+  #define kill(pid,sig)		win_kill(pid,sig)
+  #define nice(inc)		win_nice(inc)
+  #define PATH_MAX		_MAX_PATH
+  #define NULL_DEVICE		"NUL"
   #define DIRSEP		'/'
-  #define ISDIRSEP(c)	(((c)=='/') | ((c)=='\\'))
-  #define ISABS(s)	( ISDIRSEP((s)[0]) \
+  #define ISDIRSEP(c)		(((c)=='/') | ((c)=='\\'))
+  #define ISABS(s)		( ISDIRSEP((s)[0]) \
 		|| ( isupper((s)[0]) | islower((s)[0]) \
 			&& (s)[1]==':' && ISDIRSEP((s)[2]) ) )
-  #define CASEDIRSEP	case '/': case '\\'
+  #define CASEDIRSEP		case '/': case '\\'
   #define PATHSEP		';'
   #define CURDIR		'.'
-  #define DEFAULT_TEMPDIRS {"C:/TMP", "C:/TEMP", ".", NULL}
-  #define TEMPLATE	"rtXXXXXX"
+  #define DEFAULT_TEMPDIRS	{"C:/TMP", "C:/TEMP", ".", NULL}
+  #define TEMPLATE		"rtXXXXXX"
   #define TEMPLEN		8
   #define ULIBVAR		"RAYPATH"
   #ifndef DEFPATH
     #define DEFPATH		";c:/ray/lib"
   #endif
+  #define SPECIALS		" \t\"$*?|"
+  #define QUOTCHAR		'"'
   /* <io.h> only does half the work for access() */
   #ifndef F_OK
     #define  F_OK 00
@@ -50,14 +66,6 @@
     #define S_IWUSR _S_IWRITE
   #endif
 
-  #ifdef __cplusplus
-    extern "C" {
-  #endif
-  extern char  *fixargv0();
-  #ifdef __cplusplus
-    }
-  #endif
-
 #else /* everything but Windows */
   #include <unistd.h>
   #include <sys/param.h>
@@ -77,8 +85,8 @@
     #define ISABS(s)		ISDIRSEP((s)[0])
     #define PATHSEP		';'
 	#define CURDIR		'.'
-    #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
-    #define TEMPLATE	"/tmp/rtXXXXXX"
+    #define DEFAULT_TEMPDIRS	{"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
+    #define TEMPLATE		"/tmp/rtXXXXXX"
     #define TEMPLEN		13
     #define ULIBVAR		"RAYPATH"
     #ifndef DEFPATH
@@ -96,13 +104,16 @@
     #define ISABS(s)		ISDIRSEP((s)[0])
     #define PATHSEP		':'
 	#define CURDIR		'.'
-    #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
-    #define TEMPLATE	"/tmp/rtXXXXXX"
-    #define TEMPLEN		17
+    #define DEFAULT_TEMPDIRS	{"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
+    #define TEMPLATE		"/tmp/rtXXXXXX"
+    #define TEMPLEN		13
     #define ULIBVAR		"RAYPATH"
     #ifndef DEFPATH
       #define DEFPATH		":/usr/local/lib/ray"
     #endif
+    #define SPECIALS		" \t\n'\"()${}*?[];|&"
+    #define QUOTCHAR		'\''
+    #define ALTQUOT		'"'
     #define	 fixargv0(a0)	(a0)
 
   #endif
@@ -118,6 +129,18 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+#if defined(_WIN32) || defined(_WIN64)
+  extern FILE *win_popen(char *command, char *type);
+  extern int win_pclose(FILE *p);
+  extern char  *fixargv0(char *arg0);
+#endif
+
+/* Check if any of the characters in str2 are found in str1 */
+extern int matchany(const char *str1, const char *str2);
+
+/* Convert a set of arguments into a command line for pipe() or system() */
+extern char *convert_commandline(char *cmd, const int len, char *av[]);
 
 /* Find a writeable directory for temporary files */
 /* If s is NULL, we return a static string */