r4469: Version n + 1 of the pidl ethereal parser generator. This version is

based on the idea of manipulating the .c and .h files generated by
parser.pm with perl regexps and glueing it all together to make an
ethereal plugin.

I thought this was a pretty crazy idea to start off with but it has
turned out to be not as complicated as I thought and has the huge advantage
of not duplicating any of the difficult code in parser.pm.
(This used to be commit 7007522f83740f41f9a47f5ad5942ea46320d405)

1 files changed, 17 insertions, 9 deletions

diff --git a/source4/build/pidl/pidl.pl b/source4/build/pidl/pidl.pl
index c430c75236..6d0ff69081 100755
--- a/source4/build/pidl/pidl.pl
+++ b/source4/build/pidl/pidl.pl
@@ -205,15 +205,23 @@ $dcom
 	}
 
 	if ($opt_eparser) {
-		my($parser) = dirname($output) . "/packet-dcerpc-$basename.c";
-		IdlEParser::Parse($pidl, $parser);
-		$parser = dirname($output) . "/packet-dcerpc-proto-$basename.h";
-		IdlEParser::ParseHeader($pidl, $parser);
-		my($header) = dirname($output) . "/packet-dcerpc-proto.h";
-		open(OUT, ">>$header") || die "can't open $header";
-		print OUT "#include \"ndr_$basename.h\"\n";
-		print OUT "#include \"packet-dcerpc-proto-$basename.h\"\n";
-		close(OUT);
+
+	  # Generate regular .c and .h files for marshaling and
+	  # unmarshaling.
+
+	  my($parser) = util::ChangeExtension($output, ".c");
+	  IdlParser::Parse($pidl, $parser);
+
+	  my($header) = util::ChangeExtension($output, ".h");
+	  util::FileSave($header, IdlHeader::Parse($pidl));
+
+	  # Postprocess to produce ethereal parsers.
+
+	  my($eparser) = dirname($output) . "/packet-dcerpc-$basename.c";
+	  IdlEParser::RewriteC($pidl, $parser, $eparser);
+
+	  my($eparserhdr) = dirname($output) . "/packet-dcerpc-$basename.h";
+	  IdlEParser::RewriteHeader($pidl, $header, $eparserhdr);
 	}
 
 	if ($opt_swig) {