From c71f8bc18e33da575c2f637a4dfa5e6bf120cd3c Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Tue, 7 Jan 2014 17:17:52 +0100
Subject: 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>
---
extra/scripts/install_headers.sh | 2 +-
extra/scripts/unifdef.c | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
(limited to 'extra')
diff --git a/extra/scripts/install_headers.sh b/extra/scripts/install_headers.sh
index 5a966066d..d40ae1332 100755
--- 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 b159df0a6..a65355366 100644
--- 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);
--
cgit v1.2.3