From: Todd C. Miller <Todd.Miller@sudo.ws>
Date: Tue, 16 Oct 2018 16:31:43 +0000 (-0600)
Subject: Fix up #line entries that reference lex.sudoers.c.
X-Git-Tag: SUDO_1_8_26^2~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9fd783f204fcdf631df42bc20d8b3ea9a6f19e1;p=sudo

Fix up #line entries that reference lex.sudoers.c.
---

diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index ad67a5826..765aa6959 100644
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -321,7 +321,7 @@ $(devdir)/toke.c: $(srcdir)/toke.l
 	    else \
 		toke_l="$(srcdir)/toke.l"; \
 	    fi; \
-	    cmd='$(FLEX) '"$$toke_l"'; echo "#include <config.h>" > $(devdir)/toke.c; cat lex.sudoers.c >> $(devdir)/toke.c; rm -f lex.sudoers.c'; \
+	    cmd='$(FLEX) '"$$toke_l"'; echo "#include <config.h>" > $(devdir)/toke.c; $(SED) "s/^\\(#line .*\\) \"lex\\.sudoers\\.c\"/\1 \"toke.c\"/" lex.sudoers.c >> $(devdir)/toke.c; rm -f lex.sudoers.c'; \
 	    echo "$$cmd"; eval $$cmd; \
 	fi
 
diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c
index 3274df8cf..85c96ba0d 100644
--- a/plugins/sudoers/toke.c
+++ b/plugins/sudoers/toke.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#line 3 "lex.sudoers.c"
+#line 3 "toke.c"
 
 #define  YY_INT_ALIGNED short int
 
@@ -2133,7 +2133,7 @@ int (*trace_print)(const char *msg) = sudoers_trace_print;
 
 
 
-#line 2136 "lex.sudoers.c"
+#line 2136 "toke.c"
 
 #define INITIAL 0
 #define GOTDEFS 1
@@ -2351,7 +2351,7 @@ YY_DECL
 	{
 #line 116 "toke.l"
 
-#line 2354 "lex.sudoers.c"
+#line 2354 "toke.c"
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
@@ -3277,7 +3277,7 @@ YY_RULE_SETUP
 #line 745 "toke.l"
 ECHO;
 	YY_BREAK
-#line 3280 "lex.sudoers.c"
+#line 3280 "toke.c"
 
 	case YY_END_OF_BUFFER:
 		{