CVS update: /ccvs/lib/

User: dprice  
Date: 05/05/24 09:37:42

Modified:
 /ccvs/lib/
  ChangeLog, glob.c, glob_.h

Log:
 * glob_.h, glob.c: Don't attempt to handle 64 bit file information
 explicitly when not compiling as part of glibc.

File Changes:

Directory: /ccvs/lib/
=====================

File [changed]: ChangeLog
Url: https://ccvs.cvshome.org/source/browse/ccvs/lib/ChangeLog?r1=1.435&r2=1.436
Delta lines:  +5 -0
-------------------
--- ChangeLog	23 May 2005 22:56:57 -0000	1.435
+++ ChangeLog	24 May 2005 16:37:40 -0000	1.436
@@ -1,3 +1,8 @@
+2005-05-24  Derek Price  <[email protected]>
+
+	* glob_.h, glob.c: Don't attempt to handle 64 bit file information
+	explicitly when not compiling as part of glibc.
+
 2005-05-23  Derek Price  <[email protected]>
 
 	* canonicalize.c, canonicalize.h, cycle-check.c, cycle-check.h,

File [changed]: glob.c
Url: https://ccvs.cvshome.org/source/browse/ccvs/lib/glob.c?r1=1.11&r2=1.12
Delta lines:  +8 -21
--------------------
--- glob.c	20 May 2005 18:39:47 -0000	1.11
+++ glob.c	24 May 2005 16:37:40 -0000	1.12
@@ -108,12 +108,8 @@
 # define DIRENT_MIGHT_BE_DIR(d)		true
 #endif /* HAVE_D_TYPE */
 
-#if _LIBC
-# define HAVE_STRUCT_DIRENT64	1
-#endif
-
 /* If the system has the `struct dirent64' type we use it internally.  */
-#if defined HAVE_STRUCT_DIRENT64 && !defined COMPILE_GLOB64
+#if defined _LIBC && !defined COMPILE_GLOB64
 # if defined HAVE_DIRENT_H || defined __GNU_LIBRARY__
 #  define CONVERT_D_NAMLEN(d64, d32)
 # else
@@ -174,7 +170,6 @@
 # ifndef __stat64
 #  define __stat64(fname, buf) __xstat64 (_STAT_VER, fname, buf)
 # endif
-# define HAVE_STAT64	1
 #else /* !_LIBC */
 # ifdef HAVE___POSIX_GETPWNAM_R
    /* Solaris.  */
@@ -184,24 +179,16 @@
 # include "mempcpy.h"
 # include "stat-macros.h"
 # include "strdup.h"
-#endif /* _LIBC */
-
-#include <stdbool.h>
-#include <fnmatch.h>
-
-#ifndef HAVE_STAT64
-# define __stat64(fname, buf) __stat (fname, buf)
+# define __stat64(fname, buf)	stat (fname, buf)
 # define stat64 stat
-#elif !defined _LIBC
-# define __stat64(fname, buf) stat64 (fname, buf)
-#endif
-
-#ifndef _LIBC
-# define __stat stat
+# define __stat(fname, buf)	stat (fname, buf)
 # define __alloca alloca
 # define __readdir readdir
 # define __readdir64 readdir64
-#endif
+#endif /* _LIBC */
+
+#include <stdbool.h>
+#include <fnmatch.h>
 
 #ifdef _SC_GETPW_R_SIZE_MAX
 # define GETPW_R_SIZE_MAX()	sysconf (_SC_GETPW_R_SIZE_MAX)
@@ -1165,7 +1152,7 @@
 		{
 		  const char *name;
 		  size_t len;
-#if defined HAVE_STRUCT_DIRENT64 && !defined COMPILE_GLOB64
+#if defined _LIBC && !defined COMPILE_GLOB64
 		  struct dirent64 *d;
 		  union
 		    {

File [changed]: glob_.h
Url: https://ccvs.cvshome.org/source/browse/ccvs/lib/glob_.h?r1=1.7&r2=1.8
Delta lines:  +2 -2
-------------------
--- glob_.h	18 May 2005 16:17:15 -0000	1.7
+++ glob_.h	24 May 2005 16:37:40 -0000	1.8
@@ -123,7 +123,7 @@
 #endif
   } glob_t;
 
-#ifdef __USE_LARGEFILE64
+#if defined _LIBC && defined __USE_LARGEFILE64
 # ifdef __USE_GNU
 struct stat64;
 # endif
@@ -194,7 +194,7 @@
 extern void __REDIRECT_NTH (globfree, (glob_t *__pglob), globfree64);
 #endif
 
-#ifdef __USE_LARGEFILE64
+#if defined _LIBC && defined __USE_LARGEFILE64
 extern int glob64 (__const char *__restrict __pattern, int __flags,
 		   int (*__errfunc) (__const char *, int),
 		   glob64_t *__restrict __pglob) __THROW;