aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-11-12 18:06:31 +0000
committerUlrich Drepper <drepper@redhat.com>1998-11-12 18:06:31 +0000
commitd2537a474cb637bc49abc0baad75c01e5c245752 (patch)
treea6e20bfadb0fc266093fe40639ff7a0bf8b0619f
parent085320f505022f7fbc53b229ef1dc31826e66c34 (diff)
downloadglibc-d2537a474cb637bc49abc0baad75c01e5c245752.zip
glibc-d2537a474cb637bc49abc0baad75c01e5c245752.tar.gz
glibc-d2537a474cb637bc49abc0baad75c01e5c245752.tar.bz2
Update.
1998-11-12 Ulrich Drepper <drepper@cygnus.com> * inet/netinet/in.h: Add a few more IPPROTO_* macros. * libio/Makefile (headers): Add bits/stdio.h. * libio/iofread_u.c: Undefine fread_unlocked before definition. * libio/iofwrite_u.c: Undefine fwrite_unlocked before definition. * libio/stdio.h: Move optimizations into ... * libio/bits/stdio.h: ...here. New file. * libio/iofread.c: Pretty print. 1998-11-12 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/gnu/bits/utmpx.h: Protect members of struct __exit_status with `__'. Rename pad member of struct utmpx to __unused. (RUN_LVL): Define unconditionally. * sysdeps/gnu/bits/utmp.h: Rename pad member of struct utmpx to __unused. 1998-11-12 Philip Blundell <philb@gnu.org> * sysdeps/unix/sysv/linux/netlink/netlink.h: New file, support for Linux AF_NETLINK sockets (needed since the kernel version is unusable). * sysdeps/unix/sysv/linux/Makefile: Install it. * sysdeps/unix/sysv/linux/Dist: Distribute it. 1998-11-12 Andreas Jaeger <aj@arthur.rhein-neckar.de> * timezone/tst-timezone.c (tests): Add entry for America/Chicago to test for bug in PR libc/863. 1998-11-12 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Cleanup comment. * elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): Rename macro parameter lazy to do_lazy to avoid clashing with struct member name. Reported by Ralf Baechle <ralf@uni-koblenz.de>. 1998-11-10 H.J. Lu <hjl@gnu.org> * sysdeps/unix/sysv/linux/bits/local_lim.h: Undefine NR_OPEN if it is defined in <linux/limits.h>. 1998-11-09 13:07 -0500 Zack Weinberg <zack@rabi.phys.columbia.edu> * include/protocols/routed.h: Include the real header with a full path from the top of the source tree. * include/protocols/rwhod.h: Likewise. * include/protocols/talkd.h: Likewise. * include/protocols/timed.h: Likewise. * timezone/Makefile: Don't include z.ZONE files if no_deps is set, not if avoid-generated is set. 1998-11-12 Ulrich Drepper <drepper@cygnus.com> * signal/signal.h: Undo last change. Get definition of timespec if __USE_POSIX199309. * string/bits/string2.h (__strpbrk_c2): Add intermediate cast to size_t to prevent gcc warning when using -Wqual-cast. (__strpbrk_c3): Likewise. Suggested by Alan Curry <pacman@cqc.com>.
-rw-r--r--ChangeLog68
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h12
-rw-r--r--manual/top-menu.texi2
-rw-r--r--string/bits/string2.h8
-rw-r--r--sysdeps/gnu/bits/utmp.h2
-rw-r--r--sysdeps/gnu/bits/utmpx.h10
-rw-r--r--sysdeps/unix/sysv/linux/Dist1
-rw-r--r--sysdeps/unix/sysv/linux/Makefile2
-rw-r--r--sysdeps/unix/sysv/linux/bits/local_lim.h14
-rw-r--r--sysdeps/unix/sysv/linux/netlink/netlink.h126
11 files changed, 237 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 8175e0b..7966ecc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,71 @@
+1998-11-12 Ulrich Drepper <drepper@cygnus.com>
+
+ * inet/netinet/in.h: Add a few more IPPROTO_* macros.
+
+ * libio/Makefile (headers): Add bits/stdio.h.
+ * libio/iofread_u.c: Undefine fread_unlocked before definition.
+ * libio/iofwrite_u.c: Undefine fwrite_unlocked before definition.
+ * libio/stdio.h: Move optimizations into ...
+ * libio/bits/stdio.h: ...here. New file.
+
+ * libio/iofread.c: Pretty print.
+
+1998-11-12 Mark Kettenis <kettenis@phys.uva.nl>
+
+ * sysdeps/gnu/bits/utmpx.h: Protect members of struct
+ __exit_status with `__'. Rename pad member of struct utmpx to
+ __unused.
+ (RUN_LVL): Define unconditionally.
+ * sysdeps/gnu/bits/utmp.h: Rename pad member of struct utmpx to
+ __unused.
+
+1998-11-12 Philip Blundell <philb@gnu.org>
+
+ * sysdeps/unix/sysv/linux/netlink/netlink.h: New file, support for
+ Linux AF_NETLINK sockets (needed since the kernel version is
+ unusable).
+ * sysdeps/unix/sysv/linux/Makefile: Install it.
+ * sysdeps/unix/sysv/linux/Dist: Distribute it.
+
+1998-11-12 Andreas Jaeger <aj@arthur.rhein-neckar.de>
+
+ * timezone/tst-timezone.c (tests): Add entry for America/Chicago
+ to test for bug in PR libc/863.
+
+1998-11-12 Ulrich Drepper <drepper@cygnus.com>
+
+ * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Cleanup comment.
+
+ * elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): Rename macro
+ parameter lazy to do_lazy to avoid clashing with struct member name.
+ Reported by Ralf Baechle <ralf@uni-koblenz.de>.
+
+1998-11-10 H.J. Lu <hjl@gnu.org>
+
+ * sysdeps/unix/sysv/linux/bits/local_lim.h: Undefine NR_OPEN
+ if it is defined in <linux/limits.h>.
+
+1998-11-09 13:07 -0500 Zack Weinberg <zack@rabi.phys.columbia.edu>
+
+ * include/protocols/routed.h: Include the real header with
+ a full path from the top of the source tree.
+ * include/protocols/rwhod.h: Likewise.
+ * include/protocols/talkd.h: Likewise.
+ * include/protocols/timed.h: Likewise.
+
+ * timezone/Makefile: Don't include z.ZONE files if no_deps
+ is set, not if avoid-generated is set.
+
+1998-11-12 Ulrich Drepper <drepper@cygnus.com>
+
+ * signal/signal.h: Undo last change. Get definition of timespec
+ if __USE_POSIX199309.
+
+ * string/bits/string2.h (__strpbrk_c2): Add intermediate cast to
+ size_t to prevent gcc warning when using -Wqual-cast.
+ (__strpbrk_c3): Likewise.
+ Suggested by Alan Curry <pacman@cqc.com>.
+
1998-11-11 Roland McGrath <roland@baalperazim.frob.com>
* hurd/hurdsig.c (_hurdsig_init): Add assertion that no pending,
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index dc044ad..e09b599 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+1998-11-10 H.J. Lu <hjl@gnu.org>
+
+ * sysdeps/unix/sysv/linux/bits/local_lim.h: Undefine NR_OPEN
+ if it is defined in <linux/limits.h>.
+
1998-10-29 14:28 Ulrich Drepper <drepper@cygnus.com>
* spinlock.h (__pthread_trylock): Define inline.
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h b/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h
index f884863..545a90b 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h
@@ -17,9 +17,21 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+/* The kernel header pollutes the namespace with the NR_OPEN symbol.
+ Remove this after including the header if necessary. */
+#ifndef NR_OPEN
+# define __undef_NR_OPEN
+#endif
+
/* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h>
+/* Have to remove NR_OPEN? */
+#ifdef __undef_NR_OPEN
+# undef NR_OPEN
+# undef __undef_NR_OPEN
+#endif
+
/* The number of data keys per process. */
#define _POSIX_THREAD_KEYS_MAX 128
/* This is the value this implementation supports. */
diff --git a/manual/top-menu.texi b/manual/top-menu.texi
index b08ab50..f14e172 100644
--- a/manual/top-menu.texi
+++ b/manual/top-menu.texi
@@ -1150,8 +1150,10 @@ Floating Type Macros
Installation
* Configuring and compiling:: How to compile and test GNU libc.
+* Running make install:: How to install it once you've got it compiled.
* Tools for Compilation:: You'll need these first.
* Supported Configurations:: What it runs on, what it doesn't.
+* Linux:: Specific advice for Linux systems.
* Reporting Bugs:: So they'll get fixed.
Maintenance
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 4efa525..4904a3e 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -822,7 +822,7 @@ __strpbrk_c2 (__const char *__s, char __accept1, char __accept2)
/* Please note that __accept1 and __accept2 never can be '\0'. */
while (*__s != '\0' && *__s != __accept1 && *__s != __accept2)
++__s;
- return *__s == '\0' ? NULL : (char *) __s;
+ return *__s == '\0' ? NULL : (char *) (size_t) __s;
}
__STRING_INLINE char *__strpbrk_c3 (__const char *__s, char __accept1,
@@ -835,7 +835,7 @@ __strpbrk_c3 (__const char *__s, char __accept1, char __accept2,
while (*__s != '\0' && *__s != __accept1 && *__s != __accept2
&& *__s != __accept3)
++__s;
- return *__s == '\0' ? NULL : (char *) __s;
+ return *__s == '\0' ? NULL : (char *) (size_t) __s;
}
#endif
@@ -845,7 +845,7 @@ __strpbrk_c3 (__const char *__s, char __accept1, char __accept2,
# define strstr(haystack, needle) \
(__extension__ (__builtin_constant_p (needle) && __string2_1bptr_p (needle) \
? (((__const char *) (needle))[0] == '\0' \
- ? (char *) (haystack) \
+ ? (char *) (size_t) (haystack) \
: (((__const char *) (needle))[1] == '\0' \
? strchr (haystack, \
((__const char *) (needle))[0]) \
@@ -1011,7 +1011,7 @@ __strsep_g (char **__s, __const char *__reject)
#endif
/* We need the memory allocation functions for inline strdup().
- Referring to stdlib.h (even minimally) is not allowed
+ Referring to stdlib.h (even minimally) is not allowed
in any of the tight standards compliant modes. */
#ifdef __USE_MISC
diff --git a/sysdeps/gnu/bits/utmp.h b/sysdeps/gnu/bits/utmp.h
index 6a0beb6..9310e33 100644
--- a/sysdeps/gnu/bits/utmp.h
+++ b/sysdeps/gnu/bits/utmp.h
@@ -63,7 +63,7 @@ struct utmp
long ut_session; /* Session ID, used for windowing. */
struct timeval ut_tv; /* Time entry was made. */
int32_t ut_addr_v6[4]; /* Internet address of remote host. */
- char pad[20]; /* Reserved for future use. */
+ char __unused[20]; /* Reserved for future use. */
};
/* Backwards compatibility hacks. */
diff --git a/sysdeps/gnu/bits/utmpx.h b/sysdeps/gnu/bits/utmpx.h
index b367bfb..b7613a1 100644
--- a/sysdeps/gnu/bits/utmpx.h
+++ b/sysdeps/gnu/bits/utmpx.h
@@ -40,8 +40,8 @@
type is used in `struct utmpx' below. */
struct __exit_status
{
- short int e_termination; /* Process termination status. */
- short int e_exit; /* Process exit status. */
+ short int __e_termination; /* Process termination status. */
+ short int __e_exit; /* Process exit status. */
};
@@ -59,16 +59,14 @@ struct utmpx
long int ut_session; /* Session ID, used for windowing. */
struct timeval ut_tv; /* Time entry was made. */
__int32_t ut_addr_v6[4]; /* Internet address of remote host. */
- char pad[20]; /* Reserved for future use. */
+ char __unused[20]; /* Reserved for future use. */
};
/* Values for the `ut_type' field of a `struct utmpx'. */
#define EMPTY 0 /* No valid user accounting information. */
-#ifdef __USE_GNU
-# define RUN_LVL 1 /* The system's runlevel. */
-#endif
+#define RUN_LVL 1 /* The system's runlevel. */
#define BOOT_TIME 2 /* Time of system boot. */
#define NEW_TIME 3 /* Time after system clock changed. */
#define OLD_TIME 4 /* Time when system clock changed. */
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 43ab8ba..5573247 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -35,6 +35,7 @@ netinet/if_tr.h
netinet/igmp.h
netinet/in_systm.h
netinet/ip_fw.h
+netlink/netlink.h
netpacket/packet.h
netipx/ipx.h
netrom/netrom.h
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index fe357bc..206bce4 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -84,7 +84,7 @@ sysdep_headers += sys/socketvar.h netinet/in_systm.h netinet/ip_fw.h \
netinet/if_fddi.h netinet/if_tr.h netinet/igmp.h \
netipx/ipx.h netash/ash.h netax25/ax25.h netatalk/at.h \
netrom/netrom.h netpacket/packet.h netrose/rose.h \
- neteconet/ec.h
+ neteconet/ec.h netlink/netlink.h
endif
# Don't compile the ctype glue code, since there is no old non-GNU C library.
diff --git a/sysdeps/unix/sysv/linux/bits/local_lim.h b/sysdeps/unix/sysv/linux/bits/local_lim.h
index 2674aa7..9c69e4b 100644
--- a/sysdeps/unix/sysv/linux/bits/local_lim.h
+++ b/sysdeps/unix/sysv/linux/bits/local_lim.h
@@ -1,5 +1,5 @@
/* Minimum guaranteed maximum values for system limits. Linux version.
- Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1993, 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,9 +17,21 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+/* The kernel header pollutes the namespace with the NR_OPEN symbol.
+ Remove this after including the header if necessary. */
+#ifndef NR_OPEN
+# define __undef_NR_OPEN
+#endif
+
/* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h>
+/* Have to remove NR_OPEN? */
+#ifdef __undef_NR_OPEN
+# undef NR_OPEN
+# undef __undef_NR_OPEN
+#endif
+
/* Maximum amount by which a process can descrease its asynchronous I/O
priority level. */
#define AIO_PRIO_DELTA_MAX 20
diff --git a/sysdeps/unix/sysv/linux/netlink/netlink.h b/sysdeps/unix/sysv/linux/netlink/netlink.h
new file mode 100644
index 0000000..9d75698
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/netlink/netlink.h
@@ -0,0 +1,126 @@
+/* Definitions for use with Linux AF_NETLINK sockets.
+ 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 __NETLINK_NETLINK_H
+#define __NETLINK_NETLINK_H 1
+
+#include <features.h>
+
+#include <sys/types.h>
+#include <bits/sockaddr.h>
+
+__BEGIN_DECLS
+
+struct sockaddr_nl
+ {
+ __SOCKADDR_COMMON (nl_);
+ unsigned short nl_pad; /* zero. */
+ uint32_t nl_pid; /* process pid. */
+ uint32_t nl_groups; /* multicast groups mask. */
+ };
+
+#define NETLINK_ROUTE 0 /* Routing/device hook. */
+#define NETLINK_SKIP 1 /* Reserved for ENskip. */
+#define NETLINK_USERSOCK 2 /* Reserved for user mode
+ socket protocolss. */
+#define NETLINK_FIREWALL 3 /* Firewalling hook. */
+#define NETLINK_ARPD 8
+#define NETLINK_ROUTE6 11 /* AF_INET6 route comm channel */
+#define NETLINK_IP6_FW 13
+#define NETLINK_TAPBASE 16 /* 16 to 31 are ethertap */
+
+#define MAX_LINKS 32
+
+struct nlmsghdr
+ {
+ uint32_t nlmsg_len; /* Length of message including header */
+ uint16_t nlmsg_type; /* Message content */
+ uint16_t nlmsg_flags; /* Additional flags */
+ uint32_t nlmsg_seq; /* Sequence number */
+ uint32_t nlmsg_pid; /* Sending process PID */
+ };
+
+/* Flag bits */
+#define NLM_F_REQUEST 1 /* Message is a request. */
+#define NLM_F_MULTI 2 /* Multipart message, terminated by
+ NLMSG_DONE. */
+#define NLM_F_ACK 4 /* If operation succeeds, reply with ack. */
+#define NLM_F_ECHO 8 /* Echo this request. */
+
+/* Modifiers to GET request */
+#define NLM_F_ROOT 0x100 /* specify tree root. */
+#define NLM_F_MATCH 0x200 /* return all matching. */
+#define NLM_F_ATOMIC 0x400 /* atomic GET. */
+#define NLM_F_DUMP (NLM_F_ROOT|NLM_F_MATCH)
+
+/* Modifiers to NEW request */
+#define NLM_F_REPLACE 0x100 /* Override existing. */
+#define NLM_F_EXCL 0x200 /* Do not touch, if it exists. */
+#define NLM_F_CREATE 0x400 /* Create, if it does not exist. */
+#define NLM_F_APPEND 0x800 /* Add to end of list. */
+
+/*
+ 4.4BSD ADD NLM_F_CREATE|NLM_F_EXCL
+ 4.4BSD CHANGE NLM_F_REPLACE
+
+ True CHANGE NLM_F_CREATE|NLM_F_REPLACE
+ Append NLM_F_CREATE
+ Check NLM_F_EXCL
+ */
+
+#define NLMSG_ALIGNTO 4
+
+#define NLMSG_ALIGN(len) \
+ (((len) + NLMSG_ALIGNTO - 1) & ~(NLMSG_ALIGNTO - 1))
+
+#define NLMSG_LENGTH(len) \
+ ((len) + NLMSG_ALIGN (sizeof (struct nlmsghdr)))
+
+#define NLMSG_SPACE(len) \
+ NLMSG_ALIGN (NLMSG_LENGTH (len))
+
+#define NLMSG_DATA(nlh) \
+ ((void *) (((char *) nlh) + NLMSG_LENGTH (0)))
+
+#define NLMSG_NEXT(nlh, len) \
+ ((len) -= NLMSG_ALIGN ((nlh)->nlmsg_len), \
+ (struct nlmsghdr *) (((char *) (nlh)) \
+ + NLMSG_ALIGN ((nlh)->nlmsg_len)))
+
+#define NLMSG_OK(nlh, len) \
+ ((len) > 0 && (nlh)->nlmsg_len >= sizeof (struct nlmsghdr)
+ && (nlh)->nlmsg_len <= (len))
+
+#define NLMSG_PAYLOAD(nlh,len) \
+ ((nlh)->nlmsg_len - NLMSG_SPACE (len))
+
+#define NLMSG_NOOP 0x1 /* Nothing. */
+#define NLMSG_ERROR 0x2 /* Error. */
+#define NLMSG_DONE 0x3 /* End of a dump. */
+#define NLMSG_OVERRUN 0x4 /* Data lost. */
+
+struct nlmsgerr
+ {
+ int error;
+ struct nlmsghdr msg;
+ };
+
+#define NET_MAJOR 36 /* Major 36 is reserved for networking */
+
+#endif