AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 00:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
1998-01-24  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/net/if.h (ifr_bandwidth, ifr_qlen):
	Added to follow latest kernel development.

1998-01-24 15:13  Ulrich Drepper  <drepper@happy.cygnus.com>
This commit is contained in:
Ulrich Drepper 1998-01-24 12:08:37 +00:00
parent 2f954871a4
commit ecb9d3e182
4 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
1998-01-24 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/net/if.h (ifr_bandwidth, ifr_qlen):
Added to follow latest kernel development.
1998-01-24 15:13 Ulrich Drepper <drepper@happy.cygnus.com>
* nss/db-Makefile: Handle empty and comment lines better.

21
nss/db-Makefile
View File

@ -32,6 +32,8 @@ all: $(patsubst %,$(VAR_DB)/%.db,$(notdir $(DATABASES)))
$(VAR_DB)/passwd.db: /etc/passwd
@echo -n "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { FS=":"; OFS=":"; cnt=0 } \
/^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \
{ printf "0%u ", cnt++; print } \
/^[^#]/ { printf ".%s ", $$1; print; \
printf "=%s ", $$3; print }' $^ | \
@ -41,6 +43,8 @@ $(VAR_DB)/passwd.db: /etc/passwd
$(VAR_DB)/group.db: /etc/group
@echo -n "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { FS=":"; OFS=":"; cnt=0 } \
/^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \
{ printf "0%u ", cnt++; print } \
/^[^#]/ { printf ".%s ", $$1; print; \
printf "=%s ", $$3; print }' $^ | \
@ -50,6 +54,8 @@ $(VAR_DB)/group.db: /etc/group
$(VAR_DB)/ethers.db: /etc/ethers
@echo -n "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { cnt=0 } \
/^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \
{ printf "0%u ", cnt++; print } \
/^[^#]/ { printf ".%s ", $$1; print; \
printf "=%s ", $$2; print }' $^ | \
@ -59,6 +65,8 @@ $(VAR_DB)/ethers.db: /etc/ethers
$(VAR_DB)/protocols.db: /etc/protocols
@echo -n "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { cnt=0 } \
/^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \
{ printf "0%u ", cnt++; print } \
/^[^#]/ { printf ".%s ", $$1; print; \
printf "=%s ", $$2; print; \
@ -70,6 +78,8 @@ $(VAR_DB)/protocols.db: /etc/protocols
$(VAR_DB)/rpc.db: /etc/rpc
@echo -n "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { cnt=0 } \
/^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \
{ printf "0%u ", cnt++; print } \
/^[^#]/ { printf ".%s ", $$1; print; \
printf "=%s ", $$2; print; \
@ -81,17 +91,24 @@ $(VAR_DB)/rpc.db: /etc/rpc
$(VAR_DB)/services.db: /etc/services
@echo -n "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { FS="[ \t/]+"; cnt=0 } \
/^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \
{ printf "0%u ", cnt++; print } \
/^[^#]/ { printf ".%s/%s ", $$1, $$3; print; \
printf ".%s/ ", $$1; print; \
printf "=%s/%s ", $$2, $$3; print; \
printf "=%s/ ", $$2; print; \
for (i = 4; i <= NF && !($$i ~ /^#/); ++i) \
{ printf ".%s/%s ", $$i, $$3; print } }' $^ | \
{ printf ".%s/%s ", $$i, $$3; print; \
printf ".%s/ ", $$i; print } }' $^ | \
$(MAKEDB) -o $@ -
@echo "done."
$(VAR_DB)/shadow.db: /etc/shadow
@echo -n "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { FS=":"; OFS=":"; cnt=0 } \
/^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \
{ printf "0%u ", cnt++; print } \
/^[^#]/ { printf ".%s ", $$1; print }' $^ | \
$(MAKEDB) -o $@ -
@ -100,6 +117,8 @@ $(VAR_DB)/shadow.db: /etc/shadow
$(VAR_DB)/netgroup.db: /etc/netgroup
@echo -n "$(patsubst %.db,%,$(@F))... "
@$(AWK) 'BEGIN { cnt=0 } \
/^[ \t]*$$/ { next } \
/^[ \t]*#/ { next } \
{ printf "0%u ", cnt++; print } \
/^[^#]/ { end=sub(/\\/, " "); \
gsub(/[ \t]+/, " "); \

14
nss/nss_files/files-service.c
View File

@ -1,5 +1,5 @@
/* Services file parser in nss_files module.
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
@ -39,8 +39,8 @@ LINE_PARSER
#include GENERIC
DB_LOOKUP (servbyname, 2 + strlen (name) + strlen (proto),
(".%s/%s", name, proto),
DB_LOOKUP (servbyname, 2 + strlen (name) + (proto ? strlen (proto) : 0),
(".%s/%s", name, proto ?: ""),
{
/* Must match both protocol (if specified) and name. */
if (proto != NULL && strcmp (result->s_proto, proto))
@ -49,10 +49,12 @@ DB_LOOKUP (servbyname, 2 + strlen (name) + strlen (proto),
},
const char *name, const char *proto)
DB_LOOKUP (servbyport, 21 + strlen (proto), ("=%d/%s", port, proto),
DB_LOOKUP (servbyport, 21 + (proto ? strlen (proto) : 0),
("=%d/%s", ntohs (port), proto ?: ""),
{
/* Must match both port and protocol. */
if (result->s_port == port
&& strcmp (result->s_proto, proto) == 0)
if (result->s_port == ntohs (port)
&& (proto == NULL
|| strcmp (result->s_proto, proto) == 0))
break;
}, int port, const char *proto)

2
sysdeps/unix/sysv/linux/net/if.h
View File

@ -145,6 +145,8 @@ struct ifreq
#define ifr_slave ifr_ifru.ifru_slave /* slave device */
#define ifr_data ifr_ifru.ifru_data /* for use by interface */
#define ifr_ifindex ifr_ifru.ifru_ivalue /* interface index */
#define ifr_bandwidth ifr_ifru.ifru_ivalue /* link bandwidth */
#define ifr_qlen ifr_ifru.ifru_ivalue /* queue length */
/* Structure used in SIOCGIFCONF request. Used to retrieve interface