Handle empty and comment lines better.

($(VAR_DB)/services.db): Generate entries with missing protocol value.

diff --git a/nss/db-Makefile b/nss/db-Makefile
index c10267c4dfe324013d7a5576e83911b8f85e2a15..a0dad0fd6a7432354d1bb9909e61ec722fab80aa 100644 (file)
--- a/nss/db-Makefile
+++ b/nss/db-Makefile
@@ -1,5 +1,5 @@
 # Makefile to (re-)generate db versions of system database files.
-# 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.
 # Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 #
@@ -32,16 +32,19 @@ 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; \
-                          if (!uids[$$3]++) \
-                            { printf "=%s ", $$3; print } }' $^ | \
+                          printf "=%s ", $$3; print }' $^ | \
        $(MAKEDB) -o $@ -
        @echo "done."
 
 $(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 }' $^ | \
@@ -51,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 }' $^ | \
@@ -60,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; \
@@ -71,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; \
@@ -82,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 $@ -
@@ -101,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]+/, " "); \