X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=util.h;h=2319d15e1cd541211661a2b99cebebeaa4317666;hb=5f8f474f92873b98b96654c46947e4e91c90a5c2;hp=cb9f4c9f9300c52562bdc68ffbda65f6ba94165f;hpb=bf4acbe410c9fcc2bff9bfa63411be8c6c46902a;p=p5sagit%2Fp5-mst-13.2.git diff --git a/util.h b/util.h index cb9f4c9..2319d15 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, + * 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. @@ -17,20 +18,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 */ +# else /* NEITHER DOSISH NOR EPOCISH */ # 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 */