diff options
author | Jakub Jelinek <jakub@redhat.com> | 2005-12-21 09:35:28 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2005-12-21 09:35:28 +0000 |
commit | baa0a2c9a410a88fcacdf82abc7d21b0c99c7cd3 (patch) | |
tree | 23761bbdd386ee804a16e3483d30adb8bc204c3a /sysdeps | |
parent | 2bf037b4e8e189e910a41744d79404b94235ab8b (diff) |
Updated to fedora-glibc-20051221T0931
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/mach/hurd/ifreq.c (renamed from sysdeps/mach/hurd/ifreq.h) | 25 | ||||
-rw-r--r-- | sysdeps/mach/hurd/xmknod.c | 12 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/getloadavg.c | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/ifreq.c | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/ifreq.h | 41 |
5 files changed, 15 insertions, 70 deletions
diff --git a/sysdeps/mach/hurd/ifreq.h b/sysdeps/mach/hurd/ifreq.c index 77f0b9cac0..258ea6368d 100644 --- a/sysdeps/mach/hurd/ifreq.h +++ b/sysdeps/mach/hurd/ifreq.c @@ -1,5 +1,5 @@ /* Fetch the host's network interface list. Hurd version. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002,2005 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 @@ -17,14 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <net/if.h> -#include <hurd.h> -#include <hurd/pfinet.h> -#include <sys/socket.h> -#include <sys/mman.h> - - -static inline void +void __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd) { file_t server; @@ -64,17 +57,3 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd) } } - - -static inline struct ifreq * -__if_nextreq (struct ifreq *ifr) -{ - return ifr + 1; -} - - -static inline void -__if_freereq (struct ifreq *ifreqs, int num_ifs) -{ - __munmap (ifreqs, num_ifs * sizeof (struct ifreq)); -} diff --git a/sysdeps/mach/hurd/xmknod.c b/sysdeps/mach/hurd/xmknod.c index 2989215d9c..aaa6771cd8 100644 --- a/sysdeps/mach/hurd/xmknod.c +++ b/sysdeps/mach/hurd/xmknod.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991,92,93,94,95,96,99,2002 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1993,1994,1995,1996,1999,2002,2005 + 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 @@ -57,13 +58,18 @@ __xmknod (int vers, const char *file_name, mode_t mode, dev_t *dev) translator = _HURD_FIFO; len = sizeof (_HURD_FIFO); } + else if (S_ISREG (mode)) + { + translator = NULL; + len = 0; + } else { errno = EINVAL; return -1; } - if (! S_ISFIFO (mode)) + if (translator != NULL && ! S_ISFIFO (mode)) { /* We set the translator to "ifmt\0major\0minor\0", where IFMT depends on the S_IFMT bits of our MODE argument, and MAJOR and @@ -89,7 +95,7 @@ __xmknod (int vers, const char *file_name, mode_t mode, dev_t *dev) /* Create a new, unlinked node in the target directory. */ err = __dir_mkfile (dir, O_WRITE, (mode & ~S_IFMT) & ~_hurd_umask, &node); - if (! err) + if (! err && translator != NULL) /* Set the node's translator to make it a device. */ err = __file_set_translator (node, FS_TRANS_EXCL | FS_TRANS_SET, diff --git a/sysdeps/unix/sysv/linux/getloadavg.c b/sysdeps/unix/sysv/linux/getloadavg.c index 6a521431ba..81a1c0dd52 100644 --- a/sysdeps/unix/sysv/linux/getloadavg.c +++ b/sysdeps/unix/sysv/linux/getloadavg.c @@ -1,5 +1,5 @@ /* Get system load averages. Linux (/proc/loadavg) version. - Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2003, 2005 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 @@ -55,7 +55,7 @@ getloadavg (double loadavg[], int nelem) for (i = 0; i < nelem; ++i) { char *endp; - loadavg[i] = __strtod_l (p, &endp, &_nl_C_locobj); + loadavg[i] = __strtod_l (p, &endp, _nl_C_locobj_ptr); if (endp == p) /* This should not happen. The format of /proc/loadavg must have changed. Don't return with what we have, diff --git a/sysdeps/unix/sysv/linux/ifreq.c b/sysdeps/unix/sysv/linux/ifreq.c index 098f11750f..43d54014bc 100644 --- a/sysdeps/unix/sysv/linux/ifreq.c +++ b/sysdeps/unix/sysv/linux/ifreq.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1999,2002,2003,2004,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger <aj@suse.de>. @@ -18,6 +18,7 @@ 02111-1307 USA. */ #include "ifreq.h" +#include "kernel-features.h" /* Variable to signal whether SIOCGIFCONF is not available. */ #if __ASSUME_SIOCGIFNAME == 0 || 1 diff --git a/sysdeps/unix/sysv/linux/ifreq.h b/sysdeps/unix/sysv/linux/ifreq.h deleted file mode 100644 index b92e0638e2..0000000000 --- a/sysdeps/unix/sysv/linux/ifreq.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Jaeger <aj@suse.de>. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <net/if.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include "kernel-features.h" - - -extern void __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd); - -static inline struct ifreq * -__if_nextreq (struct ifreq *ifr) -{ - return ifr + 1; -} - -static inline void -__if_freereq (struct ifreq *ifreqs, int num_ifs) -{ - free (ifreqs); -} |