From 1e16111cf1abdcc2d6a617e7ba48a80ce1556797 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 26 Jul 1996 00:34:28 +0000 Subject: [PATCH] Regenerated Sat Jul 20 21:55:31 1996 Roland McGrath Win32 hacks from . * posix/glob.c [WIN32]: Don't include ; don't use d_ino; use void * for my_realloc; include for alloca. (glob) [WIN32]: Use "c:/users/default" for ~ if no HOME variable. * posix/fnmatch.h [WIN32]: Use prototypes even if [!__STDC__]. * posix/glob.h: Likewise. Fri Jul 19 16:56:41 1996 Roland McGrath * posix/glob.h [!_AMIGA && !VMS]: Check this instead of just [!_AMIGA] for `struct stat;' forward decl. --- nss/getXXent_r.c | 2 +- nss/nss_db/db-XXX.c | 2 +- nss/nss_files/files-XXX.c | 2 +- nss/nsswitch.c | 2 +- posix/glob/ChangeLog | 163 ++++-------------------------------------- sysdeps/mach/hurd/dirstream.h | 2 +- sysdeps/unix/bsd/telldir.c | 2 +- sysdeps/unix/dirstream.h | 2 +- 8 files changed, 21 insertions(+), 156 deletions(-) diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c index a4327c8..620eebd 100644 --- a/nss/getXXent_r.c +++ b/nss/getXXent_r.c @@ -94,7 +94,7 @@ static service_user *nip; static service_user *startp; /* Protect above variable against multiple uses at the same time. */ -__libc_lock_define_initialized (static, lock); +__libc_lock_define_initialized (static, lock) /* The lookup function for the first entry of this service. */ extern int DB_LOOKUP_FCT (service_user **nip, const char *name, void **fctp); diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c index 3f6f35d..792dc5c 100644 --- a/nss/nss_db/db-XXX.c +++ b/nss/nss_db/db-XXX.c @@ -47,7 +47,7 @@ Cambridge, MA 02139, USA. */ #endif /* Locks the static variables in this file. */ -__libc_lock_define_initialized (static, lock); +__libc_lock_define_initialized (static, lock) /* Maintenance of the shared handle open on the database. */ diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c index 80efd29..da4ad1f 100644 --- a/nss/nss_files/files-XXX.c +++ b/nss/nss_files/files-XXX.c @@ -49,7 +49,7 @@ Cambridge, MA 02139, USA. */ #endif /* Locks the static variables in this file. */ -__libc_lock_define_initialized (static, lock); +__libc_lock_define_initialized (static, lock) /* Maintenance of the shared stream open on the database file. */ diff --git a/nss/nsswitch.c b/nss/nsswitch.c index d259165..3490594 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -39,7 +39,7 @@ static service_library *nss_new_service (name_database *database, const char *name); -__libc_lock_define_initialized (static, lock); +__libc_lock_define_initialized (static, lock) /* Global variable. */ diff --git a/posix/glob/ChangeLog b/posix/glob/ChangeLog index 686f07b..de04c4b 100644 --- a/posix/glob/ChangeLog +++ b/posix/glob/ChangeLog @@ -1,3 +1,17 @@ +Sat Jul 20 21:55:31 1996 Roland McGrath + + Win32 hacks from . + * posix/glob.c [WIN32]: Don't include ; don't use d_ino; + use void * for my_realloc; include for alloca. + (glob) [WIN32]: Use "c:/users/default" for ~ if no HOME variable. + * posix/fnmatch.h [WIN32]: Use prototypes even if [!__STDC__]. + * posix/glob.h: Likewise. + +Fri Jul 19 16:56:41 1996 Roland McGrath + + * posix/glob.h [!_AMIGA && !VMS]: Check this instead of just [!_AMIGA] + for `struct stat;' forward decl. + Sat Jun 22 10:44:09 1996 Roland McGrath * posix/glob.c: Include only [HAVE_ALLOCA_H], not [sparc]. @@ -7,152 +21,3 @@ Fri Jun 21 00:27:51 1996 Roland McGrath * posix/fnmatch.c (fnmatch): Fix \*[*?]+ case to increment name ptr only for ?s, not for *s. Fix from Chet Ramey. -Wed May 22 17:22:14 1996 Roland McGrath - - * posix/glob.c [VMS]: Don't include . - [HAVE_VMSDIR_H]: Include "vmsdir.h". - (glob) [VMS]: Don't grok ~. - -Mon May 13 12:03:03 1996 Roland McGrath - - * posix/glob.h [_AMIGA]: Remove `struct stat;' forward decl. - - * posix/glob.c [_AMIGA]: Don't include . - (glob): Remove bogus & in call to globfree. - [_AMIGA]: Use AmigaDOS file name conventions. - -Thu May 9 09:17:46 1996 Roland McGrath - - * posix/glob/SMakefile, posix/glob/SCOPTIONS, posix/glob/Makefile.ami: - New files, AmigaDOS support from Aaron Digulla. - * posix/Makefile (glob.tar): Add AmigaDOS support files. - -Tue Apr 2 21:27:01 1996 Andreas Schwab - - * posix/glob.c (glob_pattern_p): Avoid scanning past eos if - the pattern ends with a backslash and quoting is enabled. - * posix/fnmatch.c (fnmatch): Likewise; return FNM_NOMATCH for such - patterns. - -Thu Mar 14 06:01:07 1996 Roland McGrath - - * posix/glob.c (glob): In GLOB_BRACE brace expansion, fix buffer size - calculation to include trailing invariant portion. Don't use alloca; - instead use a dynamic auto array for GCC, malloc for non-GCC. - Handle nested braces properly. - -Fri Mar 1 10:09:46 1996 Roland McGrath - - * posix/glob.c: Use canonical code from autoconf manual for dirent - include. - [_D_NAMLEN]: Redefine NAMLEN using this. - (glob_in_dir): Use NAMLEN macro. - -Fri Jan 19 13:28:59 1996 Roland McGrath - - * posix/glob.c (glob): Use prototype in getlogin decl. - -Thu Jan 18 00:32:43 1996 Roland McGrath - - * posix/glob.c (_GNU_SOURCE): Define if undefined, so glob.h - defines GNU extensions. - * posix/fnmatch.c: Likewise. - -Fri Jan 12 13:40:01 1996 Roland McGrath - - * posix/glob.c (glob): Add parens in glob call flags arg for - GLOB_BRACE case. - -Thu Dec 14 02:28:22 1995 Roland McGrath - - * posix/glob.c (glob_in_dir): Cast result of opendir to __ptr_t, - and cast STREAM to DIR * before passing to readdir and closedir. - -Mon Dec 11 20:07:54 1995 Roland McGrath - - * posix/glob.c [! STDC_HEADERS]: Declare getenv. - (glob): Avoid using function as value. - -Fri Dec 8 13:04:51 1995 Roland McGrath - - * posix/glob.c: Implement new options GLOB_ALTDIRFUNC, GLOB_BRACE, - GLOB_TILDE, GLOB_NOMAGIC. - (glob): Use stat instead of lstat to determine directoriness. - * posix/glob.h (GLOB_ALTDIRFUNC, GLOB_BRACE, GLOB_NOMAGIC, GLOB_TILDE): - New flag bits. - (__GLOB_FLAGS): Include them. - (glob_t): New members gl_closedir, gl_readdir, gl_opendir, gl_lstat, - gl_stat. - -Mon Sep 11 14:00:14 1995 Roland McGrath - - * posix/glob.c (glob): Comment fix. - -Wed Aug 30 16:44:55 1995 Roland McGrath - - * posix/glob.c (glob): Use realloc to extend strings for GLOB_MARK - slash. - (glob_in_dir): Don't allocate extra byte here. - -Mon Aug 7 14:04:36 1995 Roland McGrath - - * posix/glob.c (glob_in_dir): Allocate GLOB_MARK byte in case when - (NFOUND == 0 && (FLAGS & GLOB_NOCHECK)). - -Sat Apr 29 15:46:57 1995 Roland McGrath - - * posix/glob.c (S_ISDIR): Define if undefined. - -Tue Apr 25 17:17:19 1995 Roland McGrath - - * posix/glob.c (glob): If GLOB_MARK set, stat names to find - directories and append slashes to them in final pass before - sorting. - (glob_in_dir): If GLOB_MARK set, just allocate the extra char for the - slash; never append it here. - -Wed Mar 8 13:38:13 1995 Roland McGrath - - * posix/glob/configure.bat: Fixes from DJ. - -Wed Feb 22 00:44:41 1995 Roland McGrath - - * posix/glob/configure.in: Put AC_ISC_POSIX before AC_CONST. - -Sun Feb 5 17:59:53 1995 Roland McGrath - - * malloc/malloc.c (__malloc_extra_blocks): New variable. - (malloc): When getting more core, get __malloc_extra_blocks extra; - put the new block at the end of the free list and let the next loop - iteration use the initial portion of it. - * malloc/free.c (_free_internal): Account for twice - __malloc_extra_blocks in deciding if we have so much extra memory - we should return it to the system. - * malloc/malloc.h (__malloc_extra_blocks): Declare it. - * posix/glob.c (prefix_array, glob_pattern_p): Remove gratuitous - const in parameter decl. - -Fri Jan 27 17:53:49 1995 Jim Meyering (meyering@comco.com) - - * posix/fnmatch.c: Declare errno if it's not defined. - That's simpler than testing #if !defined(__GNU_LIBRARY__) - && !defined(STDC_HEADERS). - -Thu Jan 26 00:02:01 1995 Roland McGrath - - * io/ftw.c: Avoid `ret' as variable name. - * posix/glob.c: Likewise. - -Wed Jan 25 00:45:56 1995 Roland McGrath - - * posix/glob/configure.in: Put AC_AIX and AC_MINIX early, before - any compile tests. - -Mon Jan 16 15:49:07 1995 Roland McGrath - - * posix/glob/Makefile.in: Remove config.h and config.log. - -Sun Jan 15 06:56:47 1995 Roland McGrath - - * posix/glob/configure.in: Add AC_CONST check. - diff --git a/sysdeps/mach/hurd/dirstream.h b/sysdeps/mach/hurd/dirstream.h index d17baf2..c13383d 100644 --- a/sysdeps/mach/hurd/dirstream.h +++ b/sysdeps/mach/hurd/dirstream.h @@ -36,7 +36,7 @@ struct __dirstream int __entry_ptr; /* Entry number `__ptr' corresponds to. */ unsigned long int __allocation; /* Space allocated for the block. */ unsigned long int __size; /* Total valid data in the block. */ - __libc_lock_define (, __lock); /* Mutex lock for this structure. */ + __libc_lock_define (, __lock) /* Mutex lock for this structure. */ }; #endif /* dirstream.h */ diff --git a/sysdeps/unix/bsd/telldir.c b/sysdeps/unix/bsd/telldir.c index 4400883..a01b302 100644 --- a/sysdeps/unix/bsd/telldir.c +++ b/sysdeps/unix/bsd/telldir.c @@ -36,7 +36,7 @@ struct record #define NBUCKETS 32 static struct record *records[32]; static off_t lastpos; -__libc_lock_define_initialized(static, lock); /* Locks above data. */ +__libc_lock_define_initialized(static, lock) /* Locks above data. */ /* Return the current position of DIRP. */ diff --git a/sysdeps/unix/dirstream.h b/sysdeps/unix/dirstream.h index 3d27967..feeb74e 100644 --- a/sysdeps/unix/dirstream.h +++ b/sysdeps/unix/dirstream.h @@ -40,7 +40,7 @@ struct __dirstream off_t filepos; /* Position of next entry to read. */ - __libc_lock_define (, lock); /* Mutex lock for this structure. */ + __libc_lock_define (, lock) /* Mutex lock for this structure. */ }; #define _DIR_dirfd(dirp) ((dirp)->fd) -- 2.7.4