diff options
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/bits/libc-lock.h | 4 | ||||
| -rw-r--r-- | sysdeps/generic/glob.c | 20 | ||||
| -rw-r--r-- | sysdeps/generic/ptsname.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/sys/sysinfo.h | 6 |
4 files changed, 26 insertions, 8 deletions
diff --git a/sysdeps/generic/bits/libc-lock.h b/sysdeps/generic/bits/libc-lock.h index 700ebd6062..ff808904a8 100644 --- a/sysdeps/generic/bits/libc-lock.h +++ b/sysdeps/generic/bits/libc-lock.h @@ -1,5 +1,5 @@ /* libc-internal interface for mutex locks. Stub version. - Copyright (C) 1996,97,99,2000,01 Free Software Foundation, Inc. + Copyright (C) 1996,97,99,2000,01,02 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -123,7 +123,7 @@ typedef int __libc_key_t; #define __libc_key_create(KEY,DEST) -1 /* Set thread-specific data associated with KEY to VAL. */ -#define __libc_setspecific(KEY,VAL) -1 +#define __libc_setspecific(KEY,VAL) ((void)0) /* Get thread-specific data associated with KEY. */ #define __libc_getspecific(KEY) 0 diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c index ce9c3d806f..5e56629082 100644 --- a/sysdeps/generic/glob.c +++ b/sysdeps/generic/glob.c @@ -191,6 +191,14 @@ extern void abort (), exit (); #endif /* Standard headers. */ +/* NAME_MAX is usually defined in <dirent.h> or <limits.h>. */ +#if defined HAVE_LIMITS_H || defined __GNU_LIBRARY__ +# include <limits.h> +#endif +#ifndef NAME_MAX +# define NAME_MAX (sizeof (((struct dirent *) 0)->d_name)) +#endif + #ifndef ANSI_STRING # ifndef bzero @@ -1330,15 +1338,21 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob) size_t len; #if defined HAVE_DIRENT64 && !defined COMPILE_GLOB64 struct dirent64 *d; - struct dirent64 d64; + union + { + struct dirent64 d64; + char room [offsetof (struct dirent64, d_name[0]) + + NAME_MAX + 1]; + } + d64buf; if (flags & GLOB_ALTDIRFUNC) { struct dirent *d32 = (*pglob->gl_readdir) (stream); if (d32 != NULL) { - CONVERT_DIRENT_DIRENT64 (&d64, d32); - d = &d64; + CONVERT_DIRENT_DIRENT64 (&d64buf.d64, d32); + d = &d64buf.d64; } else d = NULL; diff --git a/sysdeps/generic/ptsname.c b/sysdeps/generic/ptsname.c index 2f985c7d59..c16e056a97 100644 --- a/sysdeps/generic/ptsname.c +++ b/sysdeps/generic/ptsname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998. @@ -39,7 +39,7 @@ __ptsname_r (fd, buf, len) size_t len __attribute__ ((unused)); { __set_errno (ENOSYS); - return 0; + return ENOSYS; } weak_alias (__ptsname_r, ptsname_r) diff --git a/sysdeps/generic/sys/sysinfo.h b/sysdeps/generic/sys/sysinfo.h index 2c1faf189d..e3ed75c3ca 100644 --- a/sysdeps/generic/sys/sysinfo.h +++ b/sysdeps/generic/sys/sysinfo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1996-1997, 1999, 2000-2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,6 +21,8 @@ #include <features.h> +__BEGIN_DECLS + /* Return number of configured processors. */ extern int get_nprocs_conf (void) __THROW; @@ -34,4 +36,6 @@ extern long int get_phys_pages (void) __THROW; /* Return number of available physical pages of memory in the system. */ extern long int get_avphys_pages (void) __THROW; +__END_DECLS + #endif /* sys/sysinfo.h */ |