Simplify symlink portability workaround.

4 files changed, 71 insertions, 10 deletions

diff --git a/lib/Makefile.in b/lib/Makefile.in
index e9b9f2eb86e..04ee541a09c 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -50,10 +50,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-        $(top_srcdir)/m4/c-strtod.m4 $(top_srcdir)/m4/dos.m4 \
-        $(top_srcdir)/m4/extensions.m4 $(top_srcdir)/m4/filemode.m4 \
-        $(top_srcdir)/m4/getloadavg.m4 $(top_srcdir)/m4/getopt.m4 \
-        $(top_srcdir)/m4/gl-comp.m4 $(top_srcdir)/m4/gnulib-common.m4 \
+        $(top_srcdir)/m4/c-strtod.m4 $(top_srcdir)/m4/extensions.m4 \
+        $(top_srcdir)/m4/filemode.m4 $(top_srcdir)/m4/getloadavg.m4 \
+        $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gl-comp.m4 \
+        $(top_srcdir)/m4/gnulib-common.m4 \
         $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/longlong.m4 \
         $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/md5.m4 \
         $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/multiarch.m4 \
@@ -604,12 +604,12 @@ BUILT_SOURCES = arg-nonnull.h c++defs.h $(GETOPT_H) $(STDBOOL_H) \
         $(STDDEF_H) $(STDINT_H) stdlib.h sys/stat.h time.h unistd.h \
         warn-on-use.h
 EXTRA_DIST = $(top_srcdir)/./arg-nonnull.h $(top_srcdir)/./c++defs.h \
-        md5.c md5.h ftoastr.c ftoastr.h filemode.c filemode.h \
-        getloadavg.c getopt.c getopt.in.h getopt1.c getopt_int.h \
-        intprops.h lstat.c mktime-internal.h mktime.c readlink.c \
-        stat.c stdbool.in.h stddef.in.h stdint.in.h stdlib.in.h \
-        strftime.c strftime.h symlink.c sys_stat.in.h time.in.h \
-        time_r.c unistd.in.h $(top_srcdir)/./warn-on-use.h
+        md5.c md5.h dosname.h ftoastr.c ftoastr.h filemode.c \
+        filemode.h getloadavg.c getopt.c getopt.in.h getopt1.c \
+        getopt_int.h intprops.h lstat.c mktime-internal.h mktime.c \
+        readlink.c stat.c stdbool.in.h stddef.in.h stdint.in.h \
+        stdlib.in.h strftime.c strftime.h symlink.c sys_stat.in.h \
+        time.in.h time_r.c unistd.in.h $(top_srcdir)/./warn-on-use.h
 MOSTLYCLEANDIRS = sys
 MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
         c++defs.h c++defs.h-t getopt.h getopt.h-t stdbool.h \
diff --git a/lib/dosname.h b/lib/dosname.h
new file mode 100644
index 00000000000..acdd03b156e
--- /dev/null
+++ b/lib/dosname.h
@@ -0,0 +1,53 @@
+/* File names on MS-DOS/Windows systems.
+
+   Copyright (C) 2000-2001, 2004-2006, 2009-2011 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+   From Paul Eggert and Jim Meyering.  */
+
+#ifndef _DOSNAME_H
+#define _DOSNAME_H
+
+#if (defined _WIN32 || defined __WIN32__ ||     \
+     defined __MSDOS__ || defined __CYGWIN__ || \
+     defined __EMX__ || defined __DJGPP__)
+   /* This internal macro assumes ASCII, but all hosts that support drive
+      letters use ASCII.  */
+# define _IS_DRIVE_LETTER(C) (((unsigned int) (C) | ('a' - 'A')) - 'a'  \
+                              <= 'z' - 'a')
+# define FILE_SYSTEM_PREFIX_LEN(Filename) \
+          (_IS_DRIVE_LETTER ((Filename)[0]) && (Filename)[1] == ':' ? 2 : 0)
+# ifndef __CYGWIN__
+#  define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 1
+# endif
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#else
+# define FILE_SYSTEM_PREFIX_LEN(Filename) 0
+# define ISSLASH(C) ((C) == '/')
+#endif
+
+#ifndef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
+# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0
+#endif
+
+#if FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
+#  define IS_ABSOLUTE_FILE_NAME(F) ISSLASH ((F)[FILE_SYSTEM_PREFIX_LEN (F)])
+# else
+#  define IS_ABSOLUTE_FILE_NAME(F)                              \
+     (ISSLASH ((F)[0]) || FILE_SYSTEM_PREFIX_LEN (F) != 0)
+#endif
+#define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F))
+
+#endif /* DOSNAME_H_ */
diff --git a/lib/gnulib.mk b/lib/gnulib.mk
index 1d918ff5fae..b5fd4a358db 100644
--- a/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@ -78,6 +78,13 @@ EXTRA_libgnu_a_SOURCES += md5.c
 
 ## end   gnulib module crypto/md5
 
+## begin gnulib module dosname
+
+
+EXTRA_DIST += dosname.h
+
+## end   gnulib module dosname
+
 ## begin gnulib module dtoastr
 
 libgnu_a_SOURCES += dtoastr.c
diff --git a/lib/stat.c b/lib/stat.c
index f16d9144afc..cbc9100fd4d 100644
--- a/lib/stat.c
+++ b/lib/stat.c
@@ -37,6 +37,7 @@ orig_stat (const char *filename, struct stat *buf)
 #include <limits.h>
 #include <stdbool.h>
 #include <string.h>
+#include "dosname.h"
 
 /* Store information about NAME into ST.  Work around bugs with
    trailing slashes.  Mingw has other bugs (such as st_ino always