buildsys: fixup unifdef state in skiphash

attempt to fix unifdef swallowing -f defundefile lines

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

diff --git a/Makefile.in b/Makefile.in
index 9d06069..91ef72f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,7 +67,7 @@ MAKEFLAGS += -L
 $(top_builddir)include/config/linuxthreads/old.h $(top_builddir)include/config/linuxthreads/new.h:
        @true
 
-$(top_builddir)include/generated/unifdef_config.h: $(top_builddir)include/bits/uClibc_config.h| $(top_builddir)include/generated
+$(top_builddir)include/generated/unifdef_config.h: $(top_builddir)include/bits/uClibc_config.h | $(top_builddir)include/generated
        @$(disp_gen)
        $(Q)$(SED) -e '1,3d' $^ > $@
 

diff --git a/extra/scripts/install_headers.sh b/extra/scripts/install_headers.sh
index 5a96606..d40ae13 100755 (executable)
--- a/extra/scripts/install_headers.sh
+++ b/extra/scripts/install_headers.sh
@@ -64,7 +64,7 @@ while read -r filename; do
                "${srcdir}/$filename" \
        | sed -e '/^rtld_hidden_proto[  ]*([a-zA-Z0-9_]*)$/d' \
        | sed -e '/^lib\(c\|m\|resolv\|dl\|intl\|rt\|nsl\|util\|crypt\|pthread\)_hidden_proto[  ]*([a-zA-Z0-9_]*)$/d' \
-       >"${dstdir}/$filename"
+       > "${dstdir}/$filename"
 done
 )
 

diff --git a/extra/scripts/unifdef.c b/extra/scripts/unifdef.c
index b159df0..a653553 100644 (file)
--- a/extra/scripts/unifdef.c
+++ b/extra/scripts/unifdef.c
@@ -1098,7 +1098,7 @@ skiphash(void)
        const char *cp;
 
        linenum++;
-       if (fgets(tline, MAXLINE, input) == NULL) {
+       if (linestate == LS_START && fgets(tline, MAXLINE, input) == NULL) {
                if (ferror(input))
                        err(2, "can't read %s", filename);
                else
@@ -1458,9 +1458,7 @@ static bool
 defundef(void)
 {
        const char *cp, *kw, *sym, *val, *end;
-       Comment_state wascomment;
 
-       wascomment = incomment;
        cp = skiphash();
        if (cp == NULL)
                return (false);