- make-reg-dot

Do not assume that all dissectors are in the source directory.
This is the case for instance for packet-ncp2222.c which is
generated in the production directory (current).
This is particularly important when the generation is not
made in the source directory.

- ncp2222.py

Remove tabs in generated source to make the generated code
nicer and to make work the make-reg-dotc. Without that fix,
all NCP packet dissections dump core ...

svn path=/trunk/; revision=2241

1 files changed, 28 insertions, 4 deletions

diff --git a/make-reg-dotc b/make-reg-dotc
index 11d7e63590..9a80a940b1 100755
--- a/make-reg-dotc
+++ b/make-reg-dotc
@@ -20,11 +20,23 @@ echo '#include "register.h"' >>register.c-tmp
 echo 'void register_all_protocols(void) {' >>register.c-tmp
 for f in "$@"
 do
-	grep '^proto_register_[a-z_0-9A-Z]* *(' $srcdir/$f 2>/dev/null
+	if [ -e $f ]
+	then
+		srcfile=$f
+	else
+		srcfile=$srcdir/$f
+	fi
+	grep '^proto_register_[a-z_0-9A-Z]* *(' $srcfile 2>/dev/null
 done | sed -e 's/^.*://' -e 's/^\([a-z_0-9A-Z]*\).*/  {extern void \1 (void); \1 ();}/' >>register.c-tmp
 for f in "$@"
 do
-	grep '^void proto_register_[a-z_0-9A-Z]* *(' $srcdir/$f 2>/dev/null
+	if [ -e $f ]
+	then
+		srcfile=$f
+	else
+		srcfile=$srcdir/$f
+	fi
+	grep '^void proto_register_[a-z_0-9A-Z]* *(' $srcfile 2>/dev/null
 done | sed -e 's/^.*://' -e 's/^void \([a-z_0-9A-Z]*\).*/  {extern void \1 (void); \1 ();}/' >>register.c-tmp
 echo '}' >>register.c-tmp
 
@@ -34,11 +46,23 @@ echo '}' >>register.c-tmp
 echo 'void register_all_protocol_handoffs(void) {' >>register.c-tmp
 for f in "$@"
 do
-	grep '^proto_reg_handoff_[a-z_0-9A-Z]* *(' $srcdir/$f 2>/dev/null
+	if [ -e $f ]
+	then
+		srcfile=$f
+	else
+		srcfile=$srcdir/$f
+	fi
+	grep '^proto_reg_handoff_[a-z_0-9A-Z]* *(' $srcfile 2>/dev/null
 done | sed -e 's/^.*://' -e 's/^\([a-z_0-9A-Z]*\).*/  {extern void \1 (void); \1 ();}/' >>register.c-tmp
 for f in "$@"
 do
-	grep '^void proto_reg_handoff_[a-z_0-9A-Z]* *(' $srcdir/$f 2>/dev/null
+	if [ -e $f ]
+	then
+		srcfile=$f
+	else
+		srcfile=$srcdir/$f
+	fi
+	grep '^void proto_reg_handoff_[a-z_0-9A-Z]* *(' $srcfile 2>/dev/null
 done | sed -e 's/^.*://' -e 's/^void \([a-z_0-9A-Z]*\).*/  {extern void \1 (void); \1 ();}/' >>register.c-tmp
 echo '}' >>register.c-tmp
 mv register.c-tmp register.c