X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=util.h;h=ad7a28aa8180ed0e4baf1d2f40fa09a250a00a00;hb=83cd6e83f6f67657e252f6e633e259439425d98a;hp=1c2c5552e77632064b16d29b6295d573a5975d57;hpb=1d7c184104c076988718a01b77c8706aae05b092;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/util.h b/util.h
index 1c2c555..ad7a28a 100644
--- a/util.h
+++ b/util.h
@@ -1,6 +1,6 @@
 /*    util.h
  *
- *    Copyright (c) 1991-1997, Larry Wall
+ *    Copyright (c) 1991-2002, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -17,16 +17,26 @@
 #else		/* !VMS */
 #  ifdef WIN32
 #    define PERL_FILE_IS_ABSOLUTE(f) \
-	(*(f) == '/'							\
-	 || ((f)[0] && (f)[1] == ':')		/* drive name */	\
-	 || ((f)[0] == '\\' && (f)[1] == '\\'))	/* UNC path */
+	(*(f) == '/' || *(f) == '\\'		/* UNC/rooted path */	\
+	 || ((f)[0] && (f)[1] == ':'))		/* drive name */
 #  else		/* !WIN32 */
-#    ifdef DOSISH
+#  ifdef NETWARE
+#    define PERL_FILE_IS_ABSOLUTE(f) \
+	(((f)[0] && (f)[1] == ':')		/* drive name */	\
+	 || ((f)[0] == '\\' && (f)[1] == '\\')	/* UNC path */	\
+	 ||	((f)[3] == ':'))				/* volume name, currently only sys */
+#  else		/* !NETWARE */
+#    if defined( DOSISH) || defined(EPOC)
 #      define PERL_FILE_IS_ABSOLUTE(f) \
 	(*(f) == '/'							\
 	 || ((f)[0] && (f)[1] == ':'))		/* drive name */
-#    else	/* !DOSISH */
-#      define PERL_FILE_IS_ABSOLUTE(f)	(*(f) == '/')
+#    else	/* NEITHER DOSISH NOR EPOCISH */
+#      ifdef MACOS_TRADITIONAL
+#        define PERL_FILE_IS_ABSOLUTE(f)	(strchr(f, ':') && *(f) != ':')
+#      else /* !MACOS_TRADITIONAL */
+#        define PERL_FILE_IS_ABSOLUTE(f)	(*(f) == '/')
+#      endif /* MACOS_TRADITIONAL */
 #    endif	/* DOSISH */
+#   endif	/* NETWARE */
 #  endif	/* WIN32 */
 #endif		/* VMS */