--- ray/src/common/paths.h	2003/06/08 12:01:52	2.13
+++ ray/src/common/paths.h	2003/06/30 14:59:11	2.16
@@ -1,4 +1,4 @@
-/* RCSid $Id: paths.h,v 2.13 2003/06/08 12:01:52 schorsch Exp $ */
+/* RCSid $Id: paths.h,v 2.16 2003/06/30 14:59:11 schorsch Exp $ */
 /*
  * Definitions for paths on different machines
  */
@@ -8,98 +8,102 @@
 extern "C" {
 #endif
 
-#include "copyright.h"
-
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef _WIN32
- #include <io.h>
- #define access _access
- #define PATH_MAX _MAX_PATH
-#else /* _WIN32 */
- #include <unistd.h>
- #include <sys/param.h>
-#endif /* _WIN32 */
 
 #ifdef _WIN32
+  #include <io.h>
 
-#define DIRSEP		'/'
-#define ISDIRSEP(c)	((c)=='/' || (c)=='\\')
-#define ISABS(s)	((s)!=NULL \
-        && (s[0])!='\0' \
-        && (   ISDIRSEP(s[0]) \
-            || (   (s[1])!='\0' \
-                && (isupper(s[0])||islower(s[0])) \
-                && (s[1])==':')))
-#define CASEDIRSEP	case '/': case '\\'
-#define PATHSEP		';'
-#define MAXPATH		128
-#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
-/* <io.h> only does half the work for access() */
-#ifndef F_OK
-#define  F_OK 00
-#define  W_OK 02
-#define  R_OK 04
-#endif
+  #define access _access
+  #define PATH_MAX _MAX_PATH
+  #define DIRSEP		'/'
+  #define ISDIRSEP(c)	((c)=='/' || (c)=='\\')
+  #define ISABS(s)	((s)!=NULL \
+		  && (s[0])!='\0' \
+          && (   ISDIRSEP(s[0]) \
+              || (   (s[1])!='\0' \
+                  && (isupper(s[0])||islower(s[0])) \
+                  && (s[1])==':')))
+  #define CASEDIRSEP	case '/': case '\\'
+  #define PATHSEP		';'
+  #define CURDIR		'.'
+  /*#define MAXPATH		512*/ /* obsoleted by posix PATH_MAX */
+  #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
+  /* <io.h> only does half the work for access() */
+  #ifndef F_OK
+    #define  F_OK 00
+    #define  X_OK 01
+    #define  W_OK 02
+    #define  R_OK 04
+  #endif
 extern char  *fixargv0();
 
-#else
-#ifdef AMIGA
+#else /* everything but Windows */
+  #include <unistd.h>
+  #include <sys/param.h>
 
-#define DIRSEP		'/'
-#define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
-#define PATHSEP		';'
-#define MAXPATH		128
-#define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
-#define TEMPLATE	"/tmp/rtXXXXXX"
-#define TEMPLEN		13
-#define ULIBVAR		"RAYPATH"
-#ifndef DEFPATH
-#define DEFPATH		";/ray/lib"
-#endif
-#define	 fixargv0(a0)	(a0)
+  #define RMAX_PATH_MAX 4096 /* our own maximum */
+  #ifndef PATH_MAX
+    #define PATH_MAX 512
+  #elif PATH_MAX > RMAX_PATH_MAX /* the OS is exaggerating */
+    #undef PATH_MAX
+    #define PATH_MAX RMAX_PATH_MAX
+  #endif
 
-#else
+  #ifdef AMIGA
 
-#define DIRSEP		'/'
-#define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
-#define PATHSEP		':'
-#define MAXPATH		256
-#define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
-#define TEMPLATE	"/usr/tmp/rtXXXXXX"
-#define TEMPLEN		17
-#define ULIBVAR		"RAYPATH"
-#ifndef DEFPATH
-#define DEFPATH		":/usr/local/lib/ray"
-#endif
-#define	 fixargv0(a0)	(a0)
+    #define DIRSEP		'/'
+    #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
+    #define PATHSEP		';'
+	#define CURDIR		'.'
+    /*#define MAXPATH		128*/ /* obsoleted by posix PATH_MAX */
+    #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
+    #define TEMPLATE	"/tmp/rtXXXXXX"
+    #define TEMPLEN		13
+    #define ULIBVAR		"RAYPATH"
+    #ifndef DEFPATH
+      #define DEFPATH		";/ray/lib"
+    #endif
+    #define	 fixargv0(a0)	(a0)
 
+  #else
+
+    /* posix */
+
+	/* this is defined as _PATH_DEVNULL in /usr/include/paths.h on Linux */
+	#define NULL_DEVICE	"/dev/null"
+    #define DIRSEP		'/'
+    #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
+    #define PATHSEP		':'
+	#define CURDIR		'.'
+    /*#define MAXPATH		256*/ /* obsoleted by posix PATH_MAX */
+    #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
+    #define TEMPLATE	"/usr/tmp/rtXXXXXX"
+    #define TEMPLEN		17
+    #define ULIBVAR		"RAYPATH"
+    #ifndef DEFPATH
+      #define DEFPATH		":/usr/local/lib/ray"
+    #endif
+    #define	 fixargv0(a0)	(a0)
+
+  #endif
 #endif
-#endif
 
 #ifndef ISDIRSEP
-#define ISDIRSEP(c)	((c)==DIRSEP)
+  #define ISDIRSEP(c)	((c)==DIRSEP)
 #endif
 #ifndef CASEDIRSEP
-#define CASEDIRSEP	case DIRSEP
+  #define CASEDIRSEP	case DIRSEP
 #endif
 
-extern char  *mktemp(), *getenv();
 
-#ifdef BSD
-extern char  *getwd();
-#else
-extern char  *getcwd();
-#define  getwd(p)	getcwd(p, sizeof(p))
-#endif
-
-
 /* Find a writeable directory for temporary files */
 /* If s is NULL, we return a static string */
 extern char *temp_directory(char *s, size_t len);
@@ -114,7 +118,10 @@ extern char *temp_filename(char *s, size_t len, char *
 /* Same as above, but also open the file and return the descriptor */
 /* This one is supposed to protect against race conditions on unix */
 /* WARNING: On Windows, there's no protection against race conditions */
-extern int temp_file(char *s, size_t len, char *templ);
+extern int temp_fd(char *s, size_t len, char *templ);
+
+/* Same as above, but return a file pointer instead of a descriptor */
+extern FILE *temp_fp(char *s, size_t len, char *templ);
 
 /* Concatenate two strings, leaving exactly one DIRSEP in between */
 extern char *append_filepath(char *s1, char *s2, size_t len);