From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 20 Dec 2003 23:44:12 +0000 (-0500)
Subject: [Bug 262] Petter Reinholdtsen: Fix gcc3/Mac OS X output regexp for ntpdc/nl.pl
X-Git-Tag: NTP_4_2_3~190^2~3^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40feb3deef32ee04d345f0e31ac7d65c726d0415;p=thirdparty%2Fntp.git

[Bug 262] Petter Reinholdtsen: Fix gcc3/Mac OS X output regexp for ntpdc/nl.pl

bk: 3fe4deccTfL564YbWqeQNTPMgzBIUg
---

diff --git a/ntpdc/nl.pl.in b/ntpdc/nl.pl.in
index dfa79c26ab..720968978c 100644
--- a/ntpdc/nl.pl.in
+++ b/ntpdc/nl.pl.in
@@ -20,13 +20,13 @@ while (<>) {
 	    printf "  printf(\"sizeof($type) = %%d\\n\", \n\t (int) sizeof($type));\n";
 	    next;
 	}
-	if (/\s*\w+\s*(\w*)(\[.*\])?\s*;\s*$/) {
+	if (/\s*\w+\s+(\w*)\s*(\[.*\])?\s*;\s*$/) {
 	    $field = $1;
 	    print STDERR "\tfield = '$field'\n" if $debug;
 	    printf "  printf(\"offsetof($field) = %%d\\n\", \n\t (int) offsetof($type, $field));\n";
 	    next;
 	}
-	if (/^};$/) {
+	if (/^} *; *$/) {
 	    printf "  printf(\"\\n\");\n\n";
 	    $found = 0 if $last;
 	    next;