X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=util.h;h=660eb9162bdd30e04a25ff5d067cac684724b6f0;hb=1fef4616ad97a72dc45194bd8ac11e63e518aba2;hp=cb9f4c9f9300c52562bdc68ffbda65f6ba94165f;hpb=4b19af017623bfa3bb72bb164598a517f586e0d3;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/util.h b/util.h
index cb9f4c9..660eb91 100644
--- a/util.h
+++ b/util.h
@@ -1,6 +1,7 @@
 /*    util.h
  *
- *    Copyright (c) 1991-2000, Larry Wall
+ *    Copyright (C) 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004, 2005
+ *    by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -15,22 +16,28 @@
 		 && (isALNUM((f)[1]) || strchr("$-_]>",(f)[1])))))
 
 #else		/* !VMS */
-#  ifdef WIN32
+#  if defined(WIN32) || defined(__CYGWIN__)
 #    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) || defined(__SYMBIAN32__)
 #      define PERL_FILE_IS_ABSOLUTE(f) \
 	(*(f) == '/'							\
 	 || ((f)[0] && (f)[1] == ':'))		/* drive name */
-#    else	/* !DOSISH */
+#    else	/* NEITHER DOSISH NOR EPOCISH NOR SYMBIANISH */
 #      ifdef MACOS_TRADITIONAL
-#        define PERL_FILE_IS_ABSOLUTE(f)	(strchr(f, ':'))
+#        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 */