diff options
| -rw-r--r-- | ChangeLog | 33 | ||||
| -rw-r--r-- | sunrpc/rpcsvc/rusers.x | 10 | ||||
| -rw-r--r-- | sysdeps/generic/glob.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/glob.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/syscalls.list | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/glob64.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/paths.h | 2 |
7 files changed, 45 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index ecb64eca0d..d8c6c5cb73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +1998-08-12 17:03 Ulrich Drepper <drepper@cygnus.com> + + * include/unistd.h: Protect against multiple inclusion. + + * posix/glob.c: Don't define __glob_pattern_p is NO_GLOB_PATTERN_P + is defined, not is glob is defined. + * sysdeps/unix/sysv/linux/glob64.c: Define NO_GLOB_PATTERN_P. + +1998-08-01 17:18 H.J. Lu <hjl@gnu.org> + + * sunrpc/rpcsvc/rusers.x (xdr_utmp): Use xdr_bytes instead of + xdr_string for ut_line, ut_name and ut_host. + +1998-08-12 Andreas Jaeger <aj@arthur.rhein-neckar.de> + + * sysdeps/unix/sysv/linux/paths.h (_PATH_MAILDIR): Change to + /var/mail in accordance with FHS 2.0. + Reported by Javier Kohen <root@jkohen.tough.com.ar> [PR libc/639]. + +1998-08-12 Richard Henderson <rth@cygnus.com> + + * sysdeps/unix/sysv/linux/alpha/syscalls.list (recvmsg, sendmsg): + Update aliases for cancelation. + + * sysdeps/unix/sysv/linux/alpha/glob.c: Undef glob*64 before + playing with symbol versions. + 1998-08-12 Roland McGrath <roland@baalperazim.frob.com> * sysdeps/mach/hurd/bits/posix_opt.h: Rewritten with comments and @@ -49,10 +76,10 @@ 1998-07-25 19:47 Jose M. Moya <josem@gnu.org> * sysdeps/mach/hurd/getcwd.c - (_hurd_canonicalize_directory_name_internal): Do not loop forever - for unknown root directories. + (_hurd_canonicalize_directory_name_internal): Do not loop forever + for unknown root directories. (__getcwd): Return NULL when the current root directory could not - be reached. + be reached. 1998-08-11 18:39 Ulrich Drepper <drepper@cygnus.com> diff --git a/sunrpc/rpcsvc/rusers.x b/sunrpc/rpcsvc/rusers.x index 641d3c2b16..7f3abeb75d 100644 --- a/sunrpc/rpcsvc/rusers.x +++ b/sunrpc/rpcsvc/rusers.x @@ -145,16 +145,20 @@ program RUSERSPROG { % if (xdrs->x_op != XDR_FREE) % { % char *ptr; +% unsigned int size; % ptr = objp->ut_line; -% if (!xdr_string (xdrs, &ptr, sizeof (objp->ut_line))) { +% size = sizeof (objp->ut_line); +% if (!xdr_bytes (xdrs, &ptr, &size, size)) { % return (FALSE); % } % ptr = objp->ut_name; -% if (!xdr_string (xdrs, &ptr, sizeof (objp->ut_name))) { +% size = sizeof (objp->ut_name); +% if (!xdr_bytes (xdrs, &ptr, &size, size)) { % return (FALSE); % } % ptr = objp->ut_host; -% if (!xdr_string (xdrs, &ptr, sizeof (objp->ut_host))) { +% size = sizeof (objp->ut_host); +% if (!xdr_bytes (xdrs, &ptr, &size, size)) { % return (FALSE); % } % } diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c index 626b0914bc..591bd56f7e 100644 --- a/sysdeps/generic/glob.c +++ b/sysdeps/generic/glob.c @@ -1122,7 +1122,7 @@ prefix_array (dirname, array, n) /* We must not compile this function twice. */ -#if !defined _LIBC || !defined glob +#if !defined _LIBC || !defined NO_GLOB_PATTERN_P /* Return nonzero if PATTERN contains any metacharacters. Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ int diff --git a/sysdeps/unix/sysv/linux/alpha/glob.c b/sysdeps/unix/sysv/linux/alpha/glob.c index 311a923026..0ce8d535be 100644 --- a/sysdeps/unix/sysv/linux/alpha/glob.c +++ b/sysdeps/unix/sysv/linux/alpha/glob.c @@ -37,6 +37,8 @@ extern void __new_globfree (glob_t *__pglob); #undef glob #undef globfree +#undef glob64 +#undef globfree64 default_symbol_version(__new_glob, glob, GLIBC_2.1); default_symbol_version(__new_globfree, globfree, GLIBC_2.1); diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list index ef14984cc2..9f002b2ad1 100644 --- a/sysdeps/unix/sysv/linux/alpha/syscalls.list +++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list @@ -45,10 +45,10 @@ getsockopt - getsockopt 5 __getsockopt getsockopt listen - listen 2 __listen listen recv - recv 4 __libc_recv __recv recv recvfrom - recvfrom 6 __libc_recvfrom __recvfrom recvfrom -__recvmsg - recvmsg 3 __syscall_recvmsg +recvmsg - recvmsg 3 __libc_recvmsg recvmsg ptrace - ptrace 4 __ptrace ptrace send - send 4 __libc_send __send send -__sendmsg - sendmsg 3 __syscall_sendmsg +sendmsg - sendmsg 3 __libc_sendmsg sendmsg sendto - sendto 6 __libc_sendto __sendto sendto setsockopt - setsockopt 5 __setsockopt setsockopt shutdown - shutdown 2 __shutdown shutdown diff --git a/sysdeps/unix/sysv/linux/glob64.c b/sysdeps/unix/sysv/linux/glob64.c index 022ae54848..e5c506b435 100644 --- a/sysdeps/unix/sysv/linux/glob64.c +++ b/sysdeps/unix/sysv/linux/glob64.c @@ -15,4 +15,6 @@ #undef __stat #define __stat(file, buf) stat64 (file, buf) +#define NO_GLOB_PATTERN_P 1 + #include <sysdeps/generic/glob.c> diff --git a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h index c0a4940855..04d48df8d2 100644 --- a/sysdeps/unix/sysv/linux/paths.h +++ b/sysdeps/unix/sysv/linux/paths.h @@ -51,7 +51,7 @@ #define _PATH_KLOG "/proc/kmsg" #define _PATH_KMEM "/dev/kmem" #define _PATH_LASTLOG "/var/log/lastlog" -#define _PATH_MAILDIR "/var/spool/mail" +#define _PATH_MAILDIR "/var/mail" #define _PATH_MAN "/usr/man" #define _PATH_MEM "/dev/mem" #define _PATH_MNTTAB "/etc/fstab" |