Better empty and comment line handling.
authordrepper <drepper>
Sat, 24 Jan 1998 06:16:17 +0000 (06:16 +0000)
committerdrepper <drepper>
Sat, 24 Jan 1998 06:16:17 +0000 (06:16 +0000)
Generate entries without protocol in service db

nss/db-Makefile

index b3f1ed4..a0dad0f 100644 (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]+/, " "); \