diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/dl-sysdep.c | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/dl-sysdep.c | 12 | ||||
| -rw-r--r-- | sysdeps/posix/ttyname_r.c | 10 | ||||
| -rw-r--r-- | sysdeps/unix/getlogin.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/ioperm.c | 17 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/syscalls.list | 2 |
6 files changed, 21 insertions, 28 deletions
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index 9fab0f0922..8f9e782205 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -109,11 +109,15 @@ _dl_sysdep_start_cleanup (void) { } +#ifndef MAP_ANON +/* This is only needed if the system doesn't support MAP_ANON. */ + int _dl_sysdep_open_zero_fill (void) { return __open ("/dev/zero", O_RDONLY); } +#endif void _dl_sysdep_fatal (const char *msg, ...) diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index cffc51e1ce..ee2bf73469 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -210,15 +210,6 @@ _dl_sysdep_start_cleanup (void) __mach_port_deallocate (__mach_task_self (), __mach_task_self_); } -int -_dl_sysdep_open_zero_fill (void) -{ - /* The minimal mmap below uses the fd as a memory object port. - The real mmap used for dlopen ignores the fd for MAP_ANON. */ - return (int) MACH_PORT_NULL; -} - - void _dl_sysdep_fatal (const char *msg, ...) { @@ -523,7 +514,8 @@ __mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset) err = __vm_map (__mach_task_self (), &mapaddr, (vm_size_t) len, 0 /*ELF_MACHINE_USER_ADDRESS_MASK*/, !(flags & MAP_FIXED), - (mach_port_t) fd, (vm_offset_t) offset, + (flags & MAP_ANON) ? MACH_PORT_NULL : (mach_port_t) fd, + (vm_offset_t) offset, flags & (MAP_COPY|MAP_PRIVATE), vmprot, VM_PROT_ALL, (flags & MAP_SHARED) ? VM_INHERIT_SHARE : VM_INHERIT_COPY); diff --git a/sysdeps/posix/ttyname_r.c b/sysdeps/posix/ttyname_r.c index 30f058314d..4450a83326 100644 --- a/sysdeps/posix/ttyname_r.c +++ b/sysdeps/posix/ttyname_r.c @@ -48,7 +48,7 @@ ttyname_r (fd, buf, buflen) /* Test for the absolute minimal size. This makes life easier inside the loop. */ - if (buflen < (int) (sizeof (dev) + 2)) + if (buflen < (int) (sizeof (dev) + 1)) { errno = EINVAL; return -1; @@ -64,16 +64,16 @@ ttyname_r (fd, buf, buflen) return -1; /* Prepare the result buffer. */ - memcpy (buf, dev, sizeof (dev)); - buf[sizeof (dev)] = '/'; - buflen -= sizeof (dev) + 1; + memcpy (buf, dev, sizeof (dev) - 1); + buf[sizeof (dev) - 1] = '/'; + buflen -= sizeof (dev); while ((d = readdir (dirstream)) != NULL) if (d->d_fileno == myino) { char *cp; - cp = __stpncpy (&buf[sizeof (dev) + 1], d->d_name, + cp = __stpncpy (&buf[sizeof (dev)], d->d_name, MIN ((int) (_D_EXACT_NAMLEN (d) + 1), buflen)); cp[0] = '\0'; diff --git a/sysdeps/unix/getlogin.c b/sysdeps/unix/getlogin.c index 7446f25786..246b488f51 100644 --- a/sysdeps/unix/getlogin.c +++ b/sysdeps/unix/getlogin.c @@ -35,7 +35,7 @@ DEFUN_VOID(getlogin) char tty_pathname[2 + 2 * NAME_MAX]; char *real_tty_path = tty_pathname; char *result = NULL; - static struct utmp_data utmp_data; + static struct utmp_data utmp_data = { ut_fd: -1 }; struct utmp *ut, line; { @@ -48,7 +48,7 @@ DEFUN_VOID(getlogin) err = errno; (void) close (d); - if (errno != 0) + if (err != 0) { errno = err; return NULL; diff --git a/sysdeps/unix/sysv/linux/alpha/ioperm.c b/sysdeps/unix/sysv/linux/alpha/ioperm.c index b9630a8273..cee5f482bb 100644 --- a/sysdeps/unix/sysv/linux/alpha/ioperm.c +++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c @@ -116,13 +116,9 @@ static inline unsigned long port_to_cpu_addr (unsigned long port, int iosys, int size) { if (iosys == IOSYS_JENSEN) - { - return (port << 7) + ((size - 1) << 4) + io.base; - } + return (port << 7) + ((size - 1) << 5) + io.base; else - { - return (port << 5) + ((size - 1) << 3) + io.base; - } + return (port << 5) + ((size - 1) << 3) + io.base; } @@ -303,17 +299,18 @@ init_iosys (void) } else { - char name[256]; FILE * fp; fp = fopen (PATH_CPUINFO, "r"); if (!fp) return -1; - while ((n = fscanf (fp, "%256[^:]: %256[^\n]\n", name, systype)) != EOF) + while ((n = fscanf (fp, "system type : %256[^\n]\n", systype)) + != EOF) { - if (n == 2 && strncmp (name, "system type", 11) == 0) { + if (n == 1) break; - } + else + fgets (systype, 256, fp); } fclose(fp); diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index d29577ff6c..73b5de9b98 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -1,7 +1,7 @@ # File name Caller Syscall name # args Strong name Weak names adjtimex adjtime adjtimex 1 __adjtimex -bdflush - bdflush 2 bdflush +bdflush EXTRA bdflush 2 bdflush create_module EXTRA create_module 3 create_module delete_module EXTRA delete_module 3 delete_module fdatasync - fdatasync 1 fdatasync |