aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/bits/sockaddr.h5
-rw-r--r--sysdeps/generic/bits/socket.h4
-rw-r--r--sysdeps/generic/bits/sockunion.h40
-rw-r--r--sysdeps/generic/ptsname.c9
-rw-r--r--sysdeps/mach/hurd/bits/ioctls.h6
-rw-r--r--sysdeps/mach/hurd/dl-sysdep.c6
-rw-r--r--sysdeps/posix/mkstemp.c42
-rw-r--r--sysdeps/posix/mktemp.c46
-rw-r--r--sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h4
-rw-r--r--sysdeps/unix/bsd/unlockpt.c2
-rw-r--r--sysdeps/unix/grantpt.c4
-rw-r--r--sysdeps/unix/sysv/linux/Dist1
-rw-r--r--sysdeps/unix/sysv/linux/Makefile2
-rw-r--r--sysdeps/unix/sysv/linux/arm/profil-counter.h51
-rw-r--r--sysdeps/unix/sysv/linux/bits/socket.h7
-rw-r--r--sysdeps/unix/sysv/linux/bits/sockunion.h46
-rw-r--r--sysdeps/unix/sysv/linux/if_index.c44
-rw-r--r--sysdeps/unix/sysv/linux/mips/bits/socket.h2
-rw-r--r--sysdeps/unix/sysv/linux/ptsname.c84
-rw-r--r--sysdeps/unix/sysv/linux/sa_len.c46
20 files changed, 355 insertions, 96 deletions
diff --git a/sysdeps/generic/bits/sockaddr.h b/sysdeps/generic/bits/sockaddr.h
index 73a0e26ec4..1c523444ba 100644
--- a/sysdeps/generic/bits/sockaddr.h
+++ b/sysdeps/generic/bits/sockaddr.h
@@ -1,5 +1,5 @@
/* Definition of `struct sockaddr_*' common members. Generic/4.2 BSD version.
- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 1998 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,5 +37,8 @@ typedef unsigned short int sa_family_t;
#define __SOCKADDR_COMMON_SIZE (sizeof (unsigned short int))
+/* Return the length of a `sockaddr' structure. */
+#define SA_LEN(_x) __libc_sa_len((_x)->sa_family)
+extern int __libc_sa_len __P ((sa_family_t __af));
#endif /* bits/sockaddr.h */
diff --git a/sysdeps/generic/bits/socket.h b/sysdeps/generic/bits/socket.h
index a2858b8de8..5dc1e65370 100644
--- a/sysdeps/generic/bits/socket.h
+++ b/sysdeps/generic/bits/socket.h
@@ -1,5 +1,5 @@
/* System-specific socket constants and types. Generic/4.3 BSD version.
- Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc.
+ Copyright (C) 1991, 92, 94, 95, 96, 97, 98 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,7 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _SYS_SOCKET_H
+#if !defined _SYS_SOCKET_H && !defined _NETINET_IN_H
# error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
#endif
diff --git a/sysdeps/generic/bits/sockunion.h b/sysdeps/generic/bits/sockunion.h
new file mode 100644
index 0000000000..8f82ce0c20
--- /dev/null
+++ b/sysdeps/generic/bits/sockunion.h
@@ -0,0 +1,40 @@
+/* Definition of `sockaddr_union'. Generic/4.2 BSD version.
+ Copyright (C) 1998 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/*
+ * Never include this file directly; use <sys/socket.h> instead.
+ */
+
+#ifndef _BITS_SOCKUNION_H
+#define _BITS_SOCKUNION_H 1
+
+#include <netinet/in.h>
+#include <sys/un.h>
+
+/* Union of all sockaddr types (required by IPv6 Basic API). */
+union sockaddr_union
+ {
+ struct sockaddr sa;
+ struct sockaddr_in sin;
+ struct sockaddr_in6 sin6;
+ struct sockaddr_un sun;
+ char __maxsize[128];
+ };
+
+#endif /* bits/sockunion.h */
diff --git a/sysdeps/generic/ptsname.c b/sysdeps/generic/ptsname.c
index 7a442d0d69..1a2e61f03c 100644
--- a/sysdeps/generic/ptsname.c
+++ b/sysdeps/generic/ptsname.c
@@ -17,8 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <stdlib.h>
#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
/* Given the file descriptor of a master pty, return the pathname
of the associated slave. */
@@ -28,14 +29,14 @@ ptsname (fd)
int fd __attribute__ ((unused));
{
__set_errno (ENOSYS);
- return 0;
+ return NULL;
}
-char *
+int
__ptsname_r (fd, buf, len)
int fd __attribute__ ((unused));
char *buf __attribute__ ((unused));
- unsigned int len __attribute__ ((unused));
+ size_t len __attribute__ ((unused));
{
__set_errno (ENOSYS);
return 0;
diff --git a/sysdeps/mach/hurd/bits/ioctls.h b/sysdeps/mach/hurd/bits/ioctls.h
index a5dc446c67..1145560ab9 100644
--- a/sysdeps/mach/hurd/bits/ioctls.h
+++ b/sysdeps/mach/hurd/bits/ioctls.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1993, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1993, 1996, 1997, 1998 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
@@ -16,8 +16,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _SYS_IOCTL_H
-# error "Never use <bits/ioctls.h> directly; include <sys/ioctl.h> instead."
+#if !defined _HURD_IOCTL_H && !defined _SYS_IOCTLS_H
+# error "Never use <bits/ioctls.h> directly; include <hurd/ioctl.h> instead."
#endif
/* These macros are also defined in <bits/termios.h> (with numerically
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 7c936e9466..6fd6ea356f 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -546,8 +546,8 @@ __close (int fd)
return 0;
}
-caddr_t weak_function
-__mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
+__ptr_t weak_function
+__mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
{
error_t err;
vm_prot_t vmprot;
@@ -656,7 +656,7 @@ _dl_sysdep_message (const char *msg, ...)
? VM_INHERIT_SHARE : VM_INHERIT_COPY);
}
- return err ? (caddr_t) __hurd_fail (err) : (caddr_t) mapaddr;
+ return err ? (__ptr_t) __hurd_fail (err) : (__ptr_t) mapaddr;
}
void weak_function
diff --git a/sysdeps/posix/mkstemp.c b/sysdeps/posix/mkstemp.c
index 3765488f73..fceb59b4be 100644
--- a/sysdeps/posix/mkstemp.c
+++ b/sysdeps/posix/mkstemp.c
@@ -19,9 +19,11 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <stdint.h>
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
+#include <sys/time.h>
/* Generate a unique temporary file name from TEMPLATE.
The last six characters of TEMPLATE must be "XXXXXX";
@@ -33,30 +35,54 @@ mkstemp (template)
{
static const char letters[]
= "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+ static uint32_t value;
+ struct timeval tv;
+ char *XXXXXX;
size_t len;
- size_t i;
+ int count;
len = strlen (template);
if (len < 6 || strcmp (&template[len - 6], "XXXXXX"))
{
__set_errno (EINVAL);
- return -1;
+ return NULL;
}
- if (sprintf (&template[len - 5], "%.5u",
- (unsigned int) getpid () % 100000) != 5)
- /* Inconceivable lossage. */
- return -1;
+ /* This is where the Xs start. */
+ XXXXXX = &template[len - 6];
- for (i = 0; i < sizeof (letters); ++i)
+ /* Get some more or less random data. */
+ __gettimeofday (&tv, NULL);
+ value += tv.tv_usec | getpid ();
+
+ for (count = 0; count < TMP_MAX; ++count)
{
+ struct stat ignored;
+ uint32_t v = value;
int fd;
- template[len - 6] = letters[i];
+ /* Fill in the random bits. */
+ XXXXXX[0] = letters[v % 62];
+ v /= 62;
+ XXXXXX[1] = letters[v % 62];
+ v /= 62;
+ XXXXXX[2] = letters[v % 62];
+ v /= 62;
+ XXXXXX[3] = letters[v % 62];
+ v /= 62;
+ XXXXXX[4] = letters[v % 62];
+ v /= 62;
+ XXXXXX[5] = letters[v % 62];
fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600);
if (fd >= 0)
+ /* The file does not exist. */
return fd;
+
+ /* This is a random value. It is only necessary that the next
+ TMP_MAX values generated by adding 7777 to VALUE are different
+ with (module 2^32). */
+ value += 7777;
}
/* We return the null string if we can't find a unique file name. */
diff --git a/sysdeps/posix/mktemp.c b/sysdeps/posix/mktemp.c
index f7a1783c8f..6bbc4c0ce9 100644
--- a/sysdeps/posix/mktemp.c
+++ b/sysdeps/posix/mktemp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1996, 1998 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
@@ -16,13 +16,15 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <errno.h>
+#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <errno.h>
#include <unistd.h>
-#include <stdio.h>
-#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
/* Generate a unique temporary file name from TEMPLATE.
The last six characters of TEMPLATE must be "XXXXXX";
@@ -33,8 +35,11 @@ mktemp (template)
{
static const char letters[]
= "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+ static uint32_t value;
+ struct timeval tv;
+ char *XXXXXX;
size_t len;
- size_t i;
+ int count;
len = strlen (template);
if (len < 6 || strcmp (&template[len - 6], "XXXXXX"))
@@ -43,20 +48,39 @@ mktemp (template)
return NULL;
}
- if (sprintf (&template[len - 5], "%.5u",
- (unsigned int) getpid () % 100000) != 5)
- /* Inconceivable lossage. */
- return NULL;
+ /* This is where the Xs start. */
+ XXXXXX = &template[len - 6];
- for (i = 0; i < sizeof (letters); ++i)
+ /* Get some more or less random data. */
+ __gettimeofday (&tv, NULL);
+ value += tv.tv_usec | getpid ();
+
+ for (count = 0; count < TMP_MAX; ++count)
{
struct stat ignored;
+ uint32_t v = value;
- template[len - 6] = letters[i];
+ /* Fill in the random bits. */
+ XXXXXX[0] = letters[v % 62];
+ v /= 62;
+ XXXXXX[1] = letters[v % 62];
+ v /= 62;
+ XXXXXX[2] = letters[v % 62];
+ v /= 62;
+ XXXXXX[3] = letters[v % 62];
+ v /= 62;
+ XXXXXX[4] = letters[v % 62];
+ v /= 62;
+ XXXXXX[5] = letters[v % 62];
if (stat (template, &ignored) < 0 && errno == ENOENT)
/* The file does not exist. So return this name. */
return template;
+
+ /* This is a random value. It is only necessary that the next
+ TMP_MAX values generated by adding 7777 to VALUE are different
+ with (module 2^32). */
+ value += 7777;
}
/* We return the null string if we can't find a unique file name. */
diff --git a/sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h b/sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h
index d70dfe4031..4d5fa1d33a 100644
--- a/sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h
+++ b/sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h
@@ -1,5 +1,5 @@
/* Definition of `struct sockaddr_*' common members. 4.4 BSD version.
- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 1998 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
@@ -38,5 +38,7 @@ typedef unsigned char sa_family_t;
#define __SOCKADDR_COMMON_SIZE (2 * sizeof (unsigned char))
+/* Return the length of a `sockaddr' structure. */
+#define SA_LEN(_x) ((_x)->sa_len)
#endif /* bits/sockaddr.h */
diff --git a/sysdeps/unix/bsd/unlockpt.c b/sysdeps/unix/bsd/unlockpt.c
index 3de46eeda9..b25231c865 100644
--- a/sysdeps/unix/bsd/unlockpt.c
+++ b/sysdeps/unix/bsd/unlockpt.c
@@ -34,7 +34,7 @@ unlockpt (fd)
{
char buf[PTYNAMELEN];
- if (ptsname_r (fd, buf, PTYNAMELEN))
+ if (__ptsname_r (fd, buf, PTYNAMELEN))
return -1;
return revoke (buf);
diff --git a/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c
index 65a0d98a73..24f0e17792 100644
--- a/sysdeps/unix/grantpt.c
+++ b/sysdeps/unix/grantpt.c
@@ -47,9 +47,9 @@ grantpt (fd)
char namebuf[PTYNAMELEN];
/* Some systems do it for us. */
- if (__ptsname_r (fd, namebuf, PTYNAMELEN) == NULL)
+ if (__ptsname_r (fd, namebuf, PTYNAMELEN) != 0)
return -1;
- if (stat (namebuf, &st))
+ if (__xstat (_STAT_VER, namebuf, &st) != 0)
return -1;
if (st.st_uid == getuid ())
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 181ac53d5e..b938504627 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -46,6 +46,7 @@ rt_sigqueueinfo.c
rt_sigreturn.c
rt_sigsuspend.c
rt_sigtimedwait.c
+sa_len.c
scsi/sg.h
scsi/scsi.h
sys/acct.h
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 2bc194384a..9abab1e1ce 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -58,7 +58,7 @@ ifeq ($(subdir),socket)
sysdep_headers += net/if.h net/if_ppp.h net/ppp-comp.h \
net/ppp_defs.h net/if_arp.h net/route.h net/ethernet.h \
net/if_slip.h net/if_packet.h
-sysdep_routines += cmsg_nxthdr
+sysdep_routines += cmsg_nxthdr sa_len
endif
ifeq ($(subdir),sunrpc)
diff --git a/sysdeps/unix/sysv/linux/arm/profil-counter.h b/sysdeps/unix/sysv/linux/arm/profil-counter.h
index d84e70e7ff..0d5024fa47 100644
--- a/sysdeps/unix/sysv/linux/arm/profil-counter.h
+++ b/sysdeps/unix/sysv/linux/arm/profil-counter.h
@@ -1,5 +1,5 @@
/* Low-level statistical profiling support function. Linux/ARM version.
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998 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
@@ -18,9 +18,54 @@
Boston, MA 02111-1307, USA. */
#include <signal.h>
+#include <asm/ptrace.h>
+
+union k_sigcontext
+ {
+ struct
+ {
+ unsigned long int trap_no;
+ unsigned long int error_code;
+ unsigned long int oldmask;
+ unsigned long int arm_r0;
+ unsigned long int arm_r1;
+ unsigned long int arm_r2;
+ unsigned long int arm_r3;
+ unsigned long int arm_r4;
+ unsigned long int arm_r5;
+ unsigned long int arm_r6;
+ unsigned long int arm_r7;
+ unsigned long int arm_r8;
+ unsigned long int arm_r9;
+ unsigned long int arm_r10;
+ unsigned long int arm_fp;
+ unsigned long int arm_ip;
+ unsigned long int arm_sp;
+ unsigned long int arm_lr;
+ unsigned long int arm_pc;
+ unsigned long int arm_cpsr;
+ } v21;
+ struct
+ {
+ unsigned long int magic;
+ struct pt_regs reg;
+ unsigned long int trap_no;
+ unsigned long int error_code;
+ unsigned long int oldmask;
+ } v20;
+};
void
-profil_counter (int signo, struct sigcontext sc)
+profil_counter (int signo, int _a2, int _a3, int _a4, union k_sigcontext sc)
{
- profil_count ((void *) sc.reg.ARM_pc);
+ /* The format of struct sigcontext changed between 2.0 and 2.1 kernels.
+ Fortunately 2.0 puts a magic number in the first word and this is not
+ a legal value for `trap_no', so we can tell them apart. */
+
+ void *pc;
+ if (sc.v20.magic == 0x4B534154)
+ pc = (void *) sc.v20.reg.ARM_pc;
+ else
+ pc = (void *) sc.v21.arm_pc;
+ profil_count (pc);
}
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 0938a17a81..e74b011c1d 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -17,7 +17,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _SYS_SOCKET_H
+#ifndef __BITS_SOCKET_H
+#define __BITS_SOCKET_H
+
+#if !defined _SYS_SOCKET_H && !defined _NETINET_IN_H
# error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
#endif
@@ -230,3 +233,5 @@ struct linger
int l_onoff; /* Nonzero to linger on close. */
int l_linger; /* Time to linger. */
};
+
+#endif /* bits/socket.h */
diff --git a/sysdeps/unix/sysv/linux/bits/sockunion.h b/sysdeps/unix/sysv/linux/bits/sockunion.h
new file mode 100644
index 0000000000..b66ac41f23
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/bits/sockunion.h
@@ -0,0 +1,46 @@
+/* Definition of `sockaddr_union'. Linux version.
+ Copyright (C) 1998 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _SYS_SOCKET_H
+# error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
+#endif
+
+#include <netash/ash.h>
+#include <netatalk/at.h>
+#include <netax25/ax25.h>
+#include <netinet/in.h>
+#include <netipx/ipx.h>
+#include <netrose/rose.h>
+#include <sys/un.h>
+
+/* Union of all sockaddr types (required by IPv6 Basic API). This is
+ somewhat evil. */
+union sockaddr_union
+ {
+ struct sockaddr sa;
+ struct sockaddr_ash sash;
+ struct sockaddr_at sat;
+ struct sockaddr_ax25 sax25;
+ struct sockaddr_in sin;
+ struct sockaddr_in6 sin6;
+ struct sockaddr_ipx sipx;
+ struct sockaddr_rose rose;
+ struct sockaddr_un sun;
+ char __maxsize[128];
+ };
diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c
index 9d9bf0e0b2..de66b5cb21 100644
--- a/sysdeps/unix/sysv/linux/if_index.c
+++ b/sysdeps/unix/sysv/linux/if_index.c
@@ -117,52 +117,46 @@ if_nameindex (void)
#else
int fd = opensock ();
struct ifconf ifc;
- unsigned int rq_ifs = 4, nifs, i;
+ unsigned int nifs, i;
int rq_len;
struct if_nameindex *idx = NULL;
-#ifdef SIOCGIFCOUNT
- static int siocgifcount_works = 1;
-#endif
+ static int new_siocgifconf = 1;
+#define RQ_IFS 4
if (fd < 0)
return NULL;
-#ifdef SIOCGIFCOUNT
- /* We may be able to find out how many interfaces really exist, rather
- than guessing. This ioctl is not present in kernels before version
- 2.1.50. */
- if (siocgifcount_works)
- {
- int serrno = errno;
+ ifc.ifc_buf = NULL;
- if (ioctl (fd, SIOCGIFCOUNT, &nifs) < 0)
+ /* We may be able to get the needed buffer size directly, rather than
+ guessing. */
+ if (new_siocgifconf)
+ {
+ ifc.ifc_buf = NULL;
+ ifc.ifc_len = 0;
+ if (ioctl (fd, SIOCGIFCONF, &ifc) < 0 || ifc.ifc_len == 0)
{
- if (errno == EINVAL)
- {
- siocgifcount_works = 0;
- __set_errno (serrno);
- }
+ new_siocgifconf = 0;
+ rq_len = RQ_IFS * sizeof (struct ifreq);
}
else
- rq_ifs = nifs + 1;
+ rq_len = ifc.ifc_len;
}
-#endif
-
- ifc.ifc_buf = NULL;
+ else
+ rq_len = RQ_IFS * sizeof (struct ifreq);
/* Read all the interfaces out of the kernel. */
do
{
- rq_len = ifc.ifc_len = rq_ifs * sizeof (struct ifreq);
- ifc.ifc_buf = alloca (ifc.ifc_len);
+ ifc.ifc_buf = alloca (ifc.ifc_len = rq_len);
if ((ifc.ifc_buf == NULL) || (ioctl (fd, SIOCGIFCONF, &ifc) < 0))
{
close (fd);
return NULL;
}
- rq_ifs *= 2;
+ rq_len *= 2;
}
- while (ifc.ifc_len == rq_len);
+ while (ifc.ifc_len == rq_len && new_siocgifconf == 0);
nifs = ifc.ifc_len / sizeof (struct ifreq);
diff --git a/sysdeps/unix/sysv/linux/mips/bits/socket.h b/sysdeps/unix/sysv/linux/mips/bits/socket.h
index f481a478b2..75ed54fc56 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/socket.h
@@ -17,7 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _SYS_STAT_H
+#if !defined _SYS_STAT_H && !defined _NETINET_IN_H
# error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
#endif
diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c
index 77b6d80ac8..c81f23504c 100644
--- a/sysdeps/unix/sysv/linux/ptsname.c
+++ b/sysdeps/unix/sysv/linux/ptsname.c
@@ -24,6 +24,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <unistd.h>
#include "pty-internal.h"
@@ -40,21 +41,38 @@ char *
ptsname (fd)
int fd;
{
- return __ptsname_r (fd, namebuf, PTYNAMELEN);
+ return __ptsname_r (fd, namebuf, PTYNAMELEN) != 0 ? NULL : namebuf;
}
-char *
-__ptsname_r (fd, buf, len)
+int
+__ptsname_r (fd, buf, buflen)
int fd;
char *buf;
- unsigned int len;
+ size_t buflen;
{
- char nbuf[PTYNAMELEN], idbuf[6];
- int ptyno;
struct stat st;
+ int save = errno;
+ int ptyno;
+ char nbuf[PTYNAMELEN], idbuf[6];
+ char *cp;
#ifdef TIOCGPTN
static int tiocgptn_works = 1;
+#endif
+
+ if (!buf)
+ {
+ __set_errno (EINVAL);
+ return EINVAL;
+ }
+
+ if (!__isatty (fd))
+ {
+ __set_errno (ENOTTY);
+ return ENOTTY;
+ }
+
+#ifdef TIOCGPTN
if (tiocgptn_works)
{
if (ioctl (fd, TIOCGPTN, &ptyno) == 0)
@@ -62,23 +80,21 @@ __ptsname_r (fd, buf, len)
else
{
if(errno != EINVAL)
- return 0;
+ return errno;
else
tiocgptn_works = 0;
}
}
#endif
- /* /dev/ptmx will make it into the kernel before 32 bit dev_t, so
- this should be safe. */
- if (__fxstat (_STAT_VER, fd, &st))
- return 0;
+ if (__fxstat (_STAT_VER, fd, &st) < 0)
+ return errno;
ptyno = minor (st.st_rdev);
if (major (st.st_rdev) == 4)
ptyno -= 128;
#ifdef TIOCGPTN
-gotit:
+ gotit:
#endif
/* Two different possible naming schemes for pty slaves:
the SVr4 way. */
@@ -86,22 +102,32 @@ gotit:
idbuf[5] = '\0';
__stpcpy (__stpcpy (nbuf, "/dev/pts/"),
_itoa_word (ptyno, &idbuf[4], 10, 0));
- if (!__xstat (_STAT_VER, nbuf, &st))
- return strncpy (buf, nbuf, len);
- else
- if (errno != ENOENT)
- return NULL;
-
- /* ...and the BSD way. */
- nbuf[5] = 't';
- nbuf[7] = 'y';
- nbuf[8] = __ptyname1[ptyno / 16];
- nbuf[9] = __ptyname2[ptyno % 16];
- nbuf[10] = '\0';
-
- if (__xstat (_STAT_VER, nbuf, &st))
- return NULL;
-
- return strncpy (buf, nbuf, len);
+ if (__xstat (_STAT_VER, nbuf, &st) < 0)
+ {
+ if (errno != ENOENT)
+ return errno;
+
+ /* ...and the BSD way. */
+ nbuf[5] = 't';
+ nbuf[7] = 'y';
+ nbuf[8] = __ptyname1[ptyno / 16];
+ nbuf[9] = __ptyname2[ptyno % 16];
+ nbuf[10] = '\0';
+
+ if (__xstat (_STAT_VER, nbuf, &st) < 0)
+ return errno;
+ }
+
+ if (buflen < strlen (nbuf) + 1)
+ {
+ __set_errno (ERANGE);
+ return ERANGE;
+ }
+
+ cp = __stpncpy (buf, nbuf, buflen);
+ cp[0] = '\0';
+
+ __set_errno (save);
+ return 0;
}
weak_alias (__ptsname_r, ptsname_r)
diff --git a/sysdeps/unix/sysv/linux/sa_len.c b/sysdeps/unix/sysv/linux/sa_len.c
new file mode 100644
index 0000000000..3c66040238
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sa_len.c
@@ -0,0 +1,46 @@
+/* Copyright (C) 1998 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <sys/socket.h>
+
+#include <netatalk/at.h>
+#include <netax25/ax25.h>
+#include <netinet/in.h>
+#include <netipx/ipx.h>
+#include <netrose/rose.h>
+
+int
+__libc_sa_len (sa_family_t af)
+{
+ switch (af)
+ {
+ case AF_APPLETALK:
+ return sizeof (struct sockaddr_at);
+ case AF_AX25:
+ return sizeof (struct sockaddr_ax25);
+ case AF_INET:
+ return sizeof (struct sockaddr_in);
+ case AF_INET6:
+ return sizeof (struct sockaddr_in6);
+ case AF_IPX:
+ return sizeof (struct sockaddr_ipx);
+ case AF_ROSE:
+ return sizeof (struct sockaddr_rose);
+ }
+ return 0;
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-26 22:25:35 +0000