diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux')
| -rw-r--r-- | sysdeps/unix/sysv/linux/getcwd.c | 17 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getpt.c | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/dl-procinfo.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/if_index.c | 16 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/poll.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ttyname.c | 6 |
6 files changed, 28 insertions, 27 deletions
diff --git a/sysdeps/unix/sysv/linux/getcwd.c b/sysdeps/unix/sysv/linux/getcwd.c index bbe21d627f..fe28e2d894 100644 --- a/sysdeps/unix/sysv/linux/getcwd.c +++ b/sysdeps/unix/sysv/linux/getcwd.c @@ -1,5 +1,5 @@ /* Determine current working directory. Linux version. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -40,10 +40,10 @@ static char *generic_getcwd (char *buf, size_t size) internal_function; compiling under 2.1.92+ the libc still runs under older kernels. */ extern int __syscall_getcwd (char *buf, unsigned long size); static int no_syscall_getcwd; -static int no_new_dcache = 1; +static int have_new_dcache; #else # define no_syscall_getcwd 1 -static int no_new_dcache; +static int have_new_dcache = 1; #endif char * @@ -55,7 +55,7 @@ __getcwd (char *buf, size_t size) char *result; size_t alloc_size = size; - if (no_syscall_getcwd && no_new_dcache) + if (no_syscall_getcwd && !have_new_dcache) return generic_getcwd (buf, size); if (size == 0) @@ -101,7 +101,7 @@ __getcwd (char *buf, size_t size) if (errno == ENOSYS) { no_syscall_getcwd = 1; - no_new_dcache = 0; /* Now we will try the /proc method. */ + have_new_dcache = 1; /* Now we will try the /proc method. */ } else if (errno != ERANGE || buf != NULL) { @@ -137,12 +137,13 @@ __getcwd (char *buf, size_t size) return buf; } else - no_new_dcache = 1; + have_new_dcache = 0; } - /* Set to no_new_dcache only if error indicates that proc doesn't exist. */ + /* Set to have_new_dcache only if error indicates that proc doesn't + exist. */ if (errno != EACCES && errno != ENAMETOOLONG) - no_new_dcache = 1; + have_new_dcache = 0; /* Something went wrong. Restore the error number and use the generic version. */ diff --git a/sysdeps/unix/sysv/linux/getpt.c b/sysdeps/unix/sysv/linux/getpt.c index 8165eccc1b..d2e0f1a7b8 100644 --- a/sysdeps/unix/sysv/linux/getpt.c +++ b/sysdeps/unix/sysv/linux/getpt.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998. @@ -31,10 +31,10 @@ int __bsd_getpt (void); int __getpt (void) { - static int have_dev_ptmx = 1; + static int have_no_dev_ptmx; int fd; - if (have_dev_ptmx) + if (!have_no_dev_ptmx) { fd = __open (_PATH_DEVPTMX, O_RDWR); if (fd != -1) @@ -42,7 +42,7 @@ __getpt (void) else { if (errno == ENOENT || errno == ENODEV) - have_dev_ptmx = 0; + have_no_dev_ptmx = 1; else return -1; } diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h index 77c859ba53..7624cbc94e 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h @@ -1,5 +1,5 @@ /* Linux/i386 version of processor capability information handling macros. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -28,7 +28,7 @@ static const char x86_cap_flags[][7] = "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic", "10", "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "18", "19", "20", "21", "22", "mmx", - "fxsr", "25", "26", "27", "28", "29", "30", "amd3d" + "osfxsr", "25", "26", "27", "28", "29", "30", "amd3d" }; static inline int diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c index aa89a38e69..9b3db6abfb 100644 --- a/sysdeps/unix/sysv/linux/if_index.c +++ b/sysdeps/unix/sysv/linux/if_index.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999 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 @@ -120,7 +120,7 @@ if_nameindex (void) unsigned int nifs, i; int rq_len; struct if_nameindex *idx = NULL; - static int new_siocgifconf = 1; + static int old_siocgifconf; #define RQ_IFS 4 if (fd < 0) @@ -130,13 +130,13 @@ if_nameindex (void) /* We may be able to get the needed buffer size directly, rather than guessing. */ - if (new_siocgifconf) + if (! old_siocgifconf) { ifc.ifc_buf = NULL; ifc.ifc_len = 0; if (__ioctl (fd, SIOCGIFCONF, &ifc) < 0 || ifc.ifc_len == 0) { - new_siocgifconf = 0; + old_siocgifconf = 1; rq_len = RQ_IFS * sizeof (struct ifreq); } else @@ -156,7 +156,7 @@ if_nameindex (void) } rq_len *= 2; } - while (ifc.ifc_len == rq_len && new_siocgifconf == 0); + while (ifc.ifc_len == rq_len && old_siocgifconf); nifs = ifc.ifc_len / sizeof (struct ifreq); @@ -212,9 +212,9 @@ if_indextoname (unsigned int ifindex, char *ifname) list. This ioctl is not present in kernels before version 2.1.50. */ struct ifreq ifr; int fd; - static int siogifname_works = 1; + static int siogifname_works_not; - if (siogifname_works) + if (!siogifname_works_not) { int serrno = errno; @@ -227,7 +227,7 @@ if_indextoname (unsigned int ifindex, char *ifname) if (__ioctl (fd, SIOGIFNAME, &ifr) < 0) { if (errno == EINVAL) - siogifname_works = 0; /* Don't make the same mistake twice. */ + siogifname_works_not = 1; /* Don't make the same mistake twice. */ } else { diff --git a/sysdeps/unix/sysv/linux/poll.c b/sysdeps/unix/sysv/linux/poll.c index 880eeb9aa8..e7df3b7774 100644 --- a/sysdeps/unix/sysv/linux/poll.c +++ b/sysdeps/unix/sysv/linux/poll.c @@ -1,5 +1,5 @@ /* Poll system call, with emulation if it is not available. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999 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 @@ -37,7 +37,7 @@ __poll (fds, nfds, timeout) unsigned long int nfds; int timeout; { - static int must_emulate = 0; + static int must_emulate; if (!must_emulate) { diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c index 0dd9c704af..cc8f9f0ee2 100644 --- a/sysdeps/unix/sysv/linux/ttyname.c +++ b/sysdeps/unix/sysv/linux/ttyname.c @@ -28,7 +28,7 @@ #include <stdio-common/_itoa.h> -char *__ttyname = NULL; +char *__ttyname; static char * getttyname __P ((const char *dev, dev_t mydev, ino_t myino, int save, int *dostat)) @@ -44,7 +44,7 @@ getttyname (dev, mydev, myino, save, dostat) int *dostat; { static char *name; - static size_t namelen = 0; + static size_t namelen; struct stat st; DIR *dirstream; struct dirent *d; @@ -106,7 +106,7 @@ ttyname (fd) int fd; { static char *buf; - static size_t buflen = 0; + static size_t buflen; char procname[30]; struct stat st, st1; int dostat = 0; |