From 70ab42b16aa19b381262dc7a75a045d5ef6b2495 Mon Sep 17 00:00:00 2001

From: Peter Jones <pjones@redhat.com>

Date: Wed, 3 Sep 2014 10:01:03 -0400

Subject: [PATCH 145/260] Add grub_util_readlink()

Add grub_util_readlink().  This requires pulling in stat and readlink from

gnulib, which pulls in stat and related headers, but after that the

implementation is straightforward.

Signed-off-by: Peter Jones <pjones@redhat.com>

Reviewed-by: Adam Jackson <ajax@redhat.com>

---

 grub-core/gnulib/Makefile.am          | 177 +++++++-

 grub-core/gnulib/gettimeofday.c       | 154 +++++++

 grub-core/gnulib/pathmax.h            |  83 ++++

 grub-core/gnulib/readlink.c           |  74 ++++

 grub-core/gnulib/stat.c               | 138 +++++++

 grub-core/gnulib/sys_stat.in.h        | 732 ++++++++++++++++++++++++++++++++++

 grub-core/gnulib/sys_time.in.h        | 213 ++++++++++

 grub-core/gnulib/sys_types.in.h       |   2 +

 grub-core/gnulib/time.h               | 586 +++++++++++++++++++++++++++

 grub-core/gnulib/time.in.h            | 274 +++++++++++++

 grub-core/osdep/windows/hostdisk.c    |   6 +

 include/grub/osdep/hostfile_aros.h    |   6 +

 include/grub/osdep/hostfile_unix.h    |   6 +

 include/grub/osdep/hostfile_windows.h |   2 +

 m4/gettimeofday.m4                    | 138 +++++++

 m4/gnulib-cache.m4                    |   3 +-

 m4/gnulib-comp.m4                     |  49 +++

 m4/largefile.m4                       | 146 +++++++

 m4/pathmax.m4                         |  42 ++

 m4/readlink.m4                        |  71 ++++

 m4/stat.m4                            |  71 ++++

 m4/sys_stat_h.m4                      |  96 +++++

 m4/sys_time_h.m4                      | 110 +++++

 m4/time_h.m4                          | 118 ++++++

 24 files changed, 3295 insertions(+), 2 deletions(-)

 create mode 100644 grub-core/gnulib/gettimeofday.c

 create mode 100644 grub-core/gnulib/pathmax.h

 create mode 100644 grub-core/gnulib/readlink.c

 create mode 100644 grub-core/gnulib/stat.c

 create mode 100644 grub-core/gnulib/sys_stat.in.h

 create mode 100644 grub-core/gnulib/sys_time.in.h

 create mode 100644 grub-core/gnulib/time.h

 create mode 100644 grub-core/gnulib/time.in.h

 create mode 100644 m4/gettimeofday.m4

 create mode 100644 m4/largefile.m4

 create mode 100644 m4/pathmax.m4

 create mode 100644 m4/readlink.m4

 create mode 100644 m4/stat.m4

 create mode 100644 m4/sys_stat_h.m4

 create mode 100644 m4/sys_time_h.m4

 create mode 100644 m4/time_h.m4

diff --git a/grub-core/gnulib/Makefile.am b/grub-core/gnulib/Makefile.am

index 3444397fe..b7c5e60e1 100644

--- a/grub-core/gnulib/Makefile.am

+++ b/grub-core/gnulib/Makefile.am

@@ -21,7 +21,7 @@

 # the same distribution terms as the rest of that program.

 #

 # Generated by gnulib-tool.

-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=grub-core/gnulib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files argp error fnmatch getdelim getline gettext progname regex

+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=grub-core/gnulib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files argp error fnmatch getdelim getline gettext progname readlink regex

 AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects

@@ -326,6 +326,15 @@ libgnu_a_SOURCES += gettext.h

 ## end   gnulib module gettext-h

+## begin gnulib module gettimeofday

+

+

+EXTRA_DIST += gettimeofday.c

+

+EXTRA_libgnu_a_SOURCES += gettimeofday.c

+

+## end   gnulib module gettimeofday

+

 ## begin gnulib module havelib

@@ -596,6 +605,13 @@ EXTRA_libgnu_a_SOURCES += nl_langinfo.c

 ## end   gnulib module nl_langinfo

+## begin gnulib module pathmax

+

+

+EXTRA_DIST += pathmax.h

+

+## end   gnulib module pathmax

+

 ## begin gnulib module progname

 libgnu_a_SOURCES += progname.h progname.c

@@ -611,6 +627,15 @@ EXTRA_libgnu_a_SOURCES += rawmemchr.c

 ## end   gnulib module rawmemchr

+## begin gnulib module readlink

+

+

+EXTRA_DIST += readlink.c

+

+EXTRA_libgnu_a_SOURCES += readlink.c

+

+## end   gnulib module readlink

+

 ## begin gnulib module realloc-posix

@@ -725,6 +750,15 @@ EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h

 ## end   gnulib module snippet/warn-on-use

+## begin gnulib module stat

+

+

+EXTRA_DIST += stat.c

+

+EXTRA_libgnu_a_SOURCES += stat.c

+

+## end   gnulib module stat

+

 ## begin gnulib module stdalign

 BUILT_SOURCES += $(STDALIGN_H)

@@ -1280,6 +1314,102 @@ libgnu_a_SOURCES += strnlen1.h strnlen1.c

 ## end   gnulib module strnlen1

+## begin gnulib module sys_stat

+

+BUILT_SOURCES += sys/stat.h

+

+# We need the following in order to create <sys/stat.h> when the system

+# has one that is incomplete.

+sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)

+	$(AM_V_at)$(MKDIR_P) sys

+	$(AM_V_GEN)rm -f $@-t $@ && \

+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \

+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \

+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \

+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \

+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \

+	      -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \

+	      -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \

+	      -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \

+	      -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \

+	      -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \

+	      -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \

+	      -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \

+	      -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \

+	      -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \

+	      -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \

+	      -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \

+	      -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \

+	      -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \

+	      -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \

+	      -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \

+	      -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \

+	      -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \

+	      -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \

+	      -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \

+	      -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \

+	      -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \

+	      -e 's|@''HAVE_MKFIFO''@|$(HAVE_MKFIFO)|g' \

+	      -e 's|@''HAVE_MKFIFOAT''@|$(HAVE_MKFIFOAT)|g' \

+	      -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \

+	      -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \

+	      -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \

+	      -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \

+	      -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \

+	      -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \

+	      -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \

+	      -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \

+	      -e 's|@''REPLACE_MKFIFO''@|$(REPLACE_MKFIFO)|g' \

+	      -e 's|@''REPLACE_MKNOD''@|$(REPLACE_MKNOD)|g' \

+	      -e 's|@''REPLACE_STAT''@|$(REPLACE_STAT)|g' \

+	      -e 's|@''REPLACE_UTIMENSAT''@|$(REPLACE_UTIMENSAT)|g' \

+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \

+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \

+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \

+	      < $(srcdir)/sys_stat.in.h; \

+	} > $@-t && \

+	mv $@-t $@

+MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t

+MOSTLYCLEANDIRS += sys

+

+EXTRA_DIST += sys_stat.in.h

+

+## end   gnulib module sys_stat

+

+## begin gnulib module sys_time

+

+BUILT_SOURCES += sys/time.h

+

+# We need the following in order to create <sys/time.h> when the system

+# doesn't have one that works with the given compiler.

+sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)

+	$(AM_V_at)$(MKDIR_P) sys

+	$(AM_V_GEN)rm -f $@-t $@ && \

+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \

+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \

+	      -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \

+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \

+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \

+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \

+	      -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \

+	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \

+	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \

+	      -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \

+	      -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \

+	      -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \

+	      -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \

+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \

+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \

+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \

+	      < $(srcdir)/sys_time.in.h; \

+	} > $@-t && \

+	mv $@-t $@

+MOSTLYCLEANFILES += sys/time.h sys/time.h-t

+

+EXTRA_DIST += sys_time.in.h

+

+## end   gnulib module sys_time

+

 ## begin gnulib module sys_types

 BUILT_SOURCES += sys/types.h

@@ -1334,6 +1464,51 @@ EXTRA_DIST += sysexits.in.h

 ## end   gnulib module sysexits

+## begin gnulib module time

+

+BUILT_SOURCES += time.h

+

+# We need the following in order to create <time.h> when the system

+# doesn't have one that works with the given compiler.

+time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)

+	$(AM_V_GEN)rm -f $@-t $@ && \

+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \

+	  sed -e 's|@''GUARD_PREFIX''@|GL|g' \

+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \

+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \

+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \

+	      -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \

+	      -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \

+	      -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \

+	      -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \

+	      -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \

+	      -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \

+	      -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \

+	      -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \

+	      -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \

+	      -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \

+	      -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \

+	      -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \

+	      -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \

+	      -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \

+	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \

+	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \

+	      -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \

+	      -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \

+	      -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \

+	      -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \

+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \

+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \

+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \

+	      < $(srcdir)/time.in.h; \

+	} > $@-t && \

+	mv $@-t $@

+MOSTLYCLEANFILES += time.h time.h-t

+

+EXTRA_DIST += time.in.h

+

+## end   gnulib module time

+

 ## begin gnulib module unistd

 BUILT_SOURCES += unistd.h

diff --git a/grub-core/gnulib/gettimeofday.c b/grub-core/gnulib/gettimeofday.c

new file mode 100644

index 000000000..8b2058e8c

--- /dev/null

+++ b/grub-core/gnulib/gettimeofday.c

@@ -0,0 +1,154 @@

+/* Provide gettimeofday for systems that don't have it or for which it's broken.

+

+   Copyright (C) 2001-2003, 2005-2007, 2009-2014 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, 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/>.  */

+

+/* written by Jim Meyering */

+

+#include <config.h>

+

+/* Specification.  */

+#include <sys/time.h>

+

+#include <time.h>

+

+#if HAVE_SYS_TIMEB_H

+# include <sys/timeb.h>

+#endif

+

+#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME

+

+/* Work around the bug in some systems whereby gettimeofday clobbers

+   the static buffer that localtime uses for its return value.  The

+   gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has

+   this problem.  The tzset replacement is necessary for at least

+   Solaris 2.5, 2.5.1, and 2.6.  */

+

+static struct tm tm_zero_buffer;

+static struct tm *localtime_buffer_addr = &tm_zero_buffer;

+

+# undef localtime

+extern struct tm *localtime (time_t const *);

+

+# undef gmtime

+extern struct tm *gmtime (time_t const *);

+

+/* This is a wrapper for localtime.  It is used only on systems for which

+   gettimeofday clobbers the static buffer used for localtime's result.

+

+   On the first call, record the address of the static buffer that

+   localtime uses for its result.  */

+

+struct tm *

+rpl_localtime (time_t const *timep)

+{

+  struct tm *tm = localtime (timep);

+

+  if (localtime_buffer_addr == &tm_zero_buffer)

+    localtime_buffer_addr = tm;

+

+  return tm;

+}

+

+/* Same as above, since gmtime and localtime use the same buffer.  */

+struct tm *

+rpl_gmtime (time_t const *timep)

+{

+  struct tm *tm = gmtime (timep);

+

+  if (localtime_buffer_addr == &tm_zero_buffer)

+    localtime_buffer_addr = tm;

+

+  return tm;

+}

+

+#endif /* GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME */

+

+#if TZSET_CLOBBERS_LOCALTIME

+

+# undef tzset

+extern void tzset (void);

+

+/* This is a wrapper for tzset, for systems on which tzset may clobber

+   the static buffer used for localtime's result.  */

+void

+rpl_tzset (void)

+{

+  /* Save and restore the contents of the buffer used for localtime's

+     result around the call to tzset.  */

+  struct tm save = *localtime_buffer_addr;

+  tzset ();

+  *localtime_buffer_addr = save;

+}

+#endif

+

+/* This is a wrapper for gettimeofday.  It is used only on systems

+   that lack this function, or whose implementation of this function

+   causes problems.  */

+

+int

+gettimeofday (struct timeval *restrict tv, void *restrict tz)

+{

+#undef gettimeofday

+#if HAVE_GETTIMEOFDAY

+# if GETTIMEOFDAY_CLOBBERS_LOCALTIME

+  /* Save and restore the contents of the buffer used for localtime's

+     result around the call to gettimeofday.  */

+  struct tm save = *localtime_buffer_addr;

+# endif

+

+# if defined timeval /* 'struct timeval' overridden by gnulib?  */

+#  undef timeval

+  struct timeval otv;

+  int result = gettimeofday (&otv, (struct timezone *) tz);

+  if (result == 0)

+    {

+      tv->tv_sec = otv.tv_sec;

+      tv->tv_usec = otv.tv_usec;

+    }

+# else

+  int result = gettimeofday (tv, (struct timezone *) tz);

+# endif

+

+# if GETTIMEOFDAY_CLOBBERS_LOCALTIME

+  *localtime_buffer_addr = save;

+# endif

+

+  return result;

+

+#else

+

+# if HAVE__FTIME

+

+  struct _timeb timebuf;

+  _ftime (&timebuf);

+  tv->tv_sec = timebuf.time;

+  tv->tv_usec = timebuf.millitm * 1000;

+

+# else

+

+#  if !defined OK_TO_USE_1S_CLOCK

+#   error "Only 1-second nominal clock resolution found.  Is that intended?" \

+          "If so, compile with the -DOK_TO_USE_1S_CLOCK option."

+#  endif

+  tv->tv_sec = time (NULL);

+  tv->tv_usec = 0;

+

+# endif

+

+  return 0;

+

+#endif

+}

diff --git a/grub-core/gnulib/pathmax.h b/grub-core/gnulib/pathmax.h

new file mode 100644

index 000000000..33fc3553d

--- /dev/null

+++ b/grub-core/gnulib/pathmax.h

@@ -0,0 +1,83 @@

+/* Define PATH_MAX somehow.  Requires sys/types.h.

+   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2014 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, 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/>.  */

+

+#ifndef _PATHMAX_H

+# define _PATHMAX_H

+

+/* POSIX:2008 defines PATH_MAX to be the maximum number of bytes in a filename,

+   including the terminating NUL byte.

+   <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html>

+   PATH_MAX is not defined on systems which have no limit on filename length,

+   such as GNU/Hurd.

+

+   This file does *not* define PATH_MAX always.  Programs that use this file

+   can handle the GNU/Hurd case in several ways:

+     - Either with a package-wide handling, or with a per-file handling,

+     - Either through a

+         #ifdef PATH_MAX

+       or through a fallback like

+         #ifndef PATH_MAX

+         # define PATH_MAX 8192

+         #endif

+       or through a fallback like

+         #ifndef PATH_MAX

+         # define PATH_MAX pathconf ("/", _PC_PATH_MAX)

+         #endif

+ */

+

+# include <unistd.h>

+

+# include <limits.h>

+

+# ifndef _POSIX_PATH_MAX

+#  define _POSIX_PATH_MAX 256

+# endif

+

+/* Don't include sys/param.h if it already has been.  */

+# if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN

+#  include <sys/param.h>

+# endif

+

+# if !defined PATH_MAX && defined MAXPATHLEN

+#  define PATH_MAX MAXPATHLEN

+# endif

+

+# ifdef __hpux

+/* On HP-UX, PATH_MAX designates the maximum number of bytes in a filename,

+   *not* including the terminating NUL byte, and is set to 1023.

+   Additionally, when _XOPEN_SOURCE is defined to 500 or more, PATH_MAX is

+   not defined at all any more.  */

+#  undef PATH_MAX

+#  define PATH_MAX 1024

+# endif

+

+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__

+/* The page "Naming Files, Paths, and Namespaces" on msdn.microsoft.com,

+   section "Maximum Path Length Limitation",

+   <http://msdn.microsoft.com/en-us/library/aa365247(v=vs.85).aspx#maxpath>

+   explains that the maximum size of a filename, including the terminating

+   NUL byte, is 260 = 3 + 256 + 1.

+   This is the same value as

+     - FILENAME_MAX in <stdio.h>,

+     - _MAX_PATH in <stdlib.h>,

+     - MAX_PATH in <windef.h>.

+   Undefine the original value, because mingw's <limits.h> gets it wrong.  */

+#  undef PATH_MAX

+#  define PATH_MAX 260

+# endif

+

+#endif /* _PATHMAX_H */

diff --git a/grub-core/gnulib/readlink.c b/grub-core/gnulib/readlink.c

new file mode 100644

index 000000000..4c4963951

--- /dev/null

+++ b/grub-core/gnulib/readlink.c

@@ -0,0 +1,74 @@

+/* Stub for readlink().

+   Copyright (C) 2003-2007, 2009-2014 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/>.  */

+

+#include <config.h>

+

+/* Specification.  */

+#include <unistd.h>

+

+#include <errno.h>

+#include <string.h>

+#include <sys/stat.h>

+

+#if !HAVE_READLINK

+

+/* readlink() substitute for systems that don't have a readlink() function,

+   such as DJGPP 2.03 and mingw32.  */

+

+ssize_t

+readlink (const char *name, char *buf _GL_UNUSED,

+          size_t bufsize _GL_UNUSED)

+{

+  struct stat statbuf;

+

+  /* In general we should use lstat() here, not stat().  But on platforms

+     without symbolic links, lstat() - if it exists - would be equivalent to

+     stat(), therefore we can use stat().  This saves us a configure check.  */

+  if (stat (name, &statbuf) >= 0)

+    errno = EINVAL;

+  return -1;

+}

+

+#else /* HAVE_READLINK */

+

+# undef readlink

+

+/* readlink() wrapper that uses correct types, for systems like cygwin

+   1.5.x where readlink returns int, and which rejects trailing slash,

+   for Solaris 9.  */

+

+ssize_t

+rpl_readlink (const char *name, char *buf, size_t bufsize)

+{

+# if READLINK_TRAILING_SLASH_BUG

+  size_t len = strlen (name);

+  if (len && name[len - 1] == '/')

+    {

+      /* Even if name without the slash is a symlink to a directory,

+         both lstat() and stat() must resolve the trailing slash to

+         the directory rather than the symlink.  We can therefore

+         safely use stat() to distinguish between EINVAL and

+         ENOTDIR/ENOENT, avoiding extra overhead of rpl_lstat().  */

+      struct stat st;

+      if (stat (name, &st) == 0)

+        errno = EINVAL;

+      return -1;

+    }

+# endif /* READLINK_TRAILING_SLASH_BUG */

+  return readlink (name, buf, bufsize);

+}

+

+#endif /* HAVE_READLINK */

diff --git a/grub-core/gnulib/stat.c b/grub-core/gnulib/stat.c

new file mode 100644

index 000000000..35f4b0b1a

--- /dev/null

+++ b/grub-core/gnulib/stat.c

@@ -0,0 +1,138 @@

+/* Work around platform bugs in stat.

+   Copyright (C) 2009-2014 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/>.  */

+

+/* written by Eric Blake */

+

+/* If the user's config.h happens to include <sys/stat.h>, let it include only

+   the system's <sys/stat.h> here, so that orig_stat doesn't recurse to

+   rpl_stat.  */

+#define __need_system_sys_stat_h

+#include <config.h>

+

+/* Get the original definition of stat.  It might be defined as a macro.  */

+#include <sys/types.h>

+#include <sys/stat.h>

+#undef __need_system_sys_stat_h

+

+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__

+# if _GL_WINDOWS_64_BIT_ST_SIZE

+#  undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */

+#  define stat _stati64

+#  define REPLACE_FUNC_STAT_DIR 1

+#  undef REPLACE_FUNC_STAT_FILE

+# elif REPLACE_FUNC_STAT_FILE

+/* mingw64 has a broken stat() function, based on _stat(), in libmingwex.a.

+   Bypass it.  */

+#  define stat _stat

+#  define REPLACE_FUNC_STAT_DIR 1

+#  undef REPLACE_FUNC_STAT_FILE

+# endif

+#endif

+

+static int

+orig_stat (const char *filename, struct stat *buf)

+{

+  return stat (filename, buf);

+}

+

+/* Specification.  */

+/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc

+   eliminates this include because of the preliminary #include <sys/stat.h>

+   above.  */

+#include "sys/stat.h"

+

+#include <errno.h>

+#include <limits.h>

+#include <stdbool.h>

+#include <string.h>

+#include "dosname.h"

+#include "verify.h"

+

+#if REPLACE_FUNC_STAT_DIR

+# include "pathmax.h"

+  /* The only known systems where REPLACE_FUNC_STAT_DIR is needed also

+     have a constant PATH_MAX.  */

+# ifndef PATH_MAX

+#  error "Please port this replacement to your platform"

+# endif

+#endif

+

+/* Store information about NAME into ST.  Work around bugs with

+   trailing slashes.  Mingw has other bugs (such as st_ino always

+   being 0 on success) which this wrapper does not work around.  But

+   at least this implementation provides the ability to emulate fchdir

+   correctly.  */

+

+int

+rpl_stat (char const *name, struct stat *st)

+{

+  int result = orig_stat (name, st);

+#if REPLACE_FUNC_STAT_FILE

+  /* Solaris 9 mistakenly succeeds when given a non-directory with a

+     trailing slash.  */

+  if (result == 0 && !S_ISDIR (st->st_mode))

+    {

+      size_t len = strlen (name);

+      if (ISSLASH (name[len - 1]))

+        {

+          errno = ENOTDIR;

+          return -1;

+        }

+    }

+#endif /* REPLACE_FUNC_STAT_FILE */

+#if REPLACE_FUNC_STAT_DIR

+

+  if (result == -1 && errno == ENOENT)

+    {

+      /* Due to mingw's oddities, there are some directories (like