Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl2/gmake/dist gmake: Revert dir.c r....



details:   https://anonhg.NetBSD.org/src/rev/7b9f61ae120e
branches:  trunk
changeset: 318595:7b9f61ae120e
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Tue May 01 00:36:57 2018 +0000
description:
gmake: Revert dir.c r.1.2.

> gmake: Make this work with glibc glob interface v2
>
> http://git.savannah.gnu.org/cgit/make.git/commit/?id=193f1e81

Don't apply an imcompatible license patch.

Reported by kamil@n.o.

diffstat:

 external/gpl2/gmake/dist/dir.c |  29 ++---------------------------
 1 files changed, 2 insertions(+), 27 deletions(-)

diffs (47 lines):

diff -r e366a9460c93 -r 7b9f61ae120e external/gpl2/gmake/dist/dir.c
--- a/external/gpl2/gmake/dist/dir.c    Tue May 01 00:04:34 2018 +0000
+++ b/external/gpl2/gmake/dist/dir.c    Tue May 01 00:36:57 2018 +0000
@@ -1194,32 +1194,6 @@
 }
 #endif
 
-/* Similarly for lstat.  */
-#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
-# ifndef VMS
-#  ifndef HAVE_SYS_STAT_H
-int lstat (const char *path, struct stat *sbuf);
-#  endif
-# else
-    /* We are done with the fake lstat.  Go back to the real lstat */
-#   ifdef lstat
-#     undef lstat
-#   endif
-# endif
-# define local_lstat lstat
-#elif defined(WINDOWS32)
-/* Windows doesn't support lstat().  */
-# define local_lstat local_stat
-#else
-static int
-local_lstat (const char *path, struct stat *buf)
-{
-  int e;
-  EINTRLOOP (e, lstat (path, buf));
-  return e;
-}
-#endif
-
 void
 dir_setup_glob (glob_t *gl)
 {
@@ -1227,8 +1201,9 @@
   gl->gl_opendir = open_dirstream;
   gl->gl_readdir = read_dirstream;
   gl->gl_closedir = ansi_free;
-  gl->gl_lstat = local_lstat;
   gl->gl_stat = local_stat;
+  /* We don't bother setting gl_lstat, since glob never calls it.
+     The slot is only there for compatibility with 4.4 BSD.  */
 }
 
 void



Home | Main Index | Thread Index | Old Index