--- ray/src/common/paths.h	1992/09/08 09:08:02	2.1
+++ ray/src/common/paths.h	2003/02/22 02:07:22	2.9
@@ -1,49 +1,122 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid: $Id: paths.h,v 2.9 2003/02/22 02:07:22 greg Exp $ */
 /*
  * Definitions for paths on different machines
  */
 
-#ifdef NIX
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
+ */
 
 #ifdef MSDOS
 
-#define DIRSEP		'\\'
+#define DIRSEP		'/'
+#define ISDIRSEP(c)	((c)=='/' || (c)=='\\')
+#define CASEDIRSEP	case '/': case '\\'
 #define PATHSEP		';'
-#define TEMPLATE	"c:\\tmp\\rtXXXXXX"
-#define TEMPLEN		15
+#define MAXPATH		128
+#define TEMPLATE	"rtXXXXXX"
+#define TEMPLEN		8
 #define ULIBVAR		"RAYPATH"
-#ifndef	DEFPATH
-#define	DEFPATH		";\\ray\\lib"
+#ifndef DEFPATH
+#define DEFPATH		";c:/ray/lib"
 #endif
+extern char  *fixargv0();
 
-#endif
+#else
 #ifdef AMIGA
 
 #define DIRSEP		'/'
 #define PATHSEP		';'
+#define MAXPATH		128
 #define TEMPLATE	"/tmp/rtXXXXXX"
 #define TEMPLEN		13
 #define ULIBVAR		"RAYPATH"
-#ifndef	DEFPATH
-#define	DEFPATH		";/ray/lib"
+#ifndef DEFPATH
+#define DEFPATH		";/ray/lib"
 #endif
+#define	 fixargv0(a0)	(a0)
 
-#endif
-
 #else
 
 #define DIRSEP		'/'
 #define PATHSEP		':'
-#define TEMPLATE	"/tmp/rtXXXXXX"
-#define TEMPLEN		13
+#define MAXPATH		256
+#define TEMPLATE	"/usr/tmp/rtXXXXXX"
+#define TEMPLEN		17
 #define ULIBVAR		"RAYPATH"
-#ifndef	DEFPATH
-#define	DEFPATH		":/usr/local/lib/ray"
+#ifndef DEFPATH
+#define DEFPATH		":/usr/local/lib/ray"
 #endif
+#define	 fixargv0(a0)	(a0)
 
 #endif
+#endif
 
+#ifndef ISDIRSEP
+#define ISDIRSEP(c)	((c)==DIRSEP)
+#endif
+#ifndef CASEDIRSEP
+#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