summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/Makefile.in11
-rw-r--r--source3/utils/debug2html.c19
2 files changed, 28 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index e992adff14..8e8a76231a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -84,7 +84,8 @@ SCRIPTS = script/smbtar script/addtosmbpass
# object file lists
######################################################################
-LIB_OBJ = lib/charcnv.o lib/charset.o lib/debug.o lib/fault.o \
+LIB_OBJ = lib/charcnv.o lib/charset.o \
+ lib/debugparse.o lib/debug.o lib/fault.o \
lib/getsmbpass.o lib/interface.o lib/kanji.o lib/md4.o \
lib/membuffer.o lib/netmask.o lib/pidfile.o lib/replace.o \
lib/signal.o lib/slprintf.o lib/system.o lib/time.o lib/ufc.o \
@@ -231,6 +232,8 @@ RPCTORTURE_OBJ = utils/rpctorture.o \
$(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \
$(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ)
+DEBUG2HTML_OBJ = utils/debug2html.o lib/debugparse.o
+
PROTO_OBJ = $(SMBD_OBJ) $(NMBD_OBJ) $(SWAT_OBJ) $(CLIENT_OBJ) \
$(RPCCLIENT_OBJ) $(SMBWRAPPER_OBJ)
@@ -249,6 +252,8 @@ smbtorture : CHECK bin/smbtorture
rpctorture : CHECK bin/rpctorture
+debug2html : CHECK bin/debug2html
+
.SUFFIXES:
.SUFFIXES: .c .o .po .po32
@@ -368,6 +373,10 @@ bin/rpctorture: $(RPCTORTURE_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(LDFLAGS) $(LIBS)
+bin/debug2html: $(DEBUG2HTML_OBJ) bin/.dummy
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(LIBS)
+
bin/smbwrapper.so: $(PICOBJS)
@echo Linking shared library $@
@$(LD) @LDSHFLAGS@ -o $@ $(PICOBJS) $(LIBS)
diff --git a/source3/utils/debug2html.c b/source3/utils/debug2html.c
index ff891f0385..1763cf38b6 100644
--- a/source3/utils/debug2html.c
+++ b/source3/utils/debug2html.c
@@ -29,6 +29,22 @@
* -------------------------------------------------------------------------- **
*
* $Log: debug2html.c,v $
+ * Revision 1.2 1998/10/27 23:28:29 crh
+ * Fixed a small bug in debug2html. It wasn't properly checking EOF. The
+ * current status is "it works". I need to add some syntax error recovery
+ * and a usage message. Basic stuff.
+ *
+ * I've also modified Makefile.in. If you want to compile it you'll have to
+ * do a 'make debug2html', as I used smbtorture as a model. We can decide
+ * later if this tool is useful enough to be compiled always.
+ *
+ * BTW, a 'make realclean' fails because the bin directory isn't empty.
+ * That's because it doesn't delete optionally compiled files such as
+ * smbtorture and debug2html (and because of the CVS subdirectory, but I
+ * think that's only a problem for developers).
+ *
+ * Chris -)-----
+ *
* Revision 1.1 1998/10/26 23:21:37 crh
* Here is the simple debug parser and the debug2html converter. Still to do:
*
@@ -218,7 +234,8 @@ int main( int argc, char *argv[] )
(void)printf( "<HTML>\n<HEAD>\n" );
(void)printf( " <TITLE>Samba Debug Output</TITLE>\n</HEAD>\n\n<BODY>\n" );
- while( (len = fread( bufr, 1, BSIZE, stdin )) > 0 )
+ while( (!feof( stdin ))
+ && ((len = fread( bufr, 1, BSIZE, stdin )) > 0) )
{
for( i = 0; i < len; i++ )
{