X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=generate;h=e1efc06a95bf11186df3f92c2d10cabf5d5552d4;hb=cf7f7e9dfdb0241d091655bca63edcdae5b81c03;hp=e7da43542b3b45f309313dca470122d0a2d26b6c;hpb=f99c7def1e8afb27b0df6c605ff6847f676d6bfe;p=secnet.git

diff --git a/generate b/generate
index e7da435..e1efc06 100755
--- a/generate
+++ b/generate
@@ -147,8 +147,14 @@ sub process_input_mk ($$$$$$$$$) {
     $pfxmap{$_} = $srcdirmap{$_}.'/' foreach keys %srcdirmap;
 
     while (<$input>) {
-	if (s#^\s*$esc\:##) {
+	if (s#^\s*$esc\:changequote\s+(\S+)\s+$##) {
+	    $$esclitr = $1;
+	    $set_esc->();
+	    next;
+	} elsif (s#^\s*$esc\:(?=(-?)include)##) {
 	    $buffering_output='';
+	} elsif (m#^\s*$esc\:([a-z][-0-9a-z_]*)#) {
+	    die "unknown directive $1";
 	}
 	for (;;) {
 	    unless (s{^(.*?)$esc}{}) { o $_; last; }
@@ -194,11 +200,8 @@ sub process_input_mk ($$$$$$$$$) {
 				 $var_prefix, $var_prefix_name, $targets,
 				 $subf, $esclitr, $1);
 		o "\n";
-	    } elsif (m#^changequote\s+(\S+)\s+$#) {
-		$$esclitr = $1;
-		$set_esc->();
 	    } else {
-		die "unknown directive $_ ";
+		die "internal error buffering directive $_ ";
 	    }
 	}
     }