[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools Makefile.am,1.8,1.9 Makefile.in,1.8,1.9 mkntfs.c,1.36,1.37

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv11984/ntfstools

Modified Files:
	Makefile.am Makefile.in mkntfs.c 
Log Message:
Integrate logfile.c into mkntfs


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- Makefile.am	2001/06/11 19:11:37	1.8
+++ Makefile.am	2001/06/15 16:47:47	1.9
@@ -6,5 +6,5 @@
 endif
 
-bin_PROGRAMS		= ntfsfix ntfsdump_logfile mkntfs ldm
+bin_PROGRAMS		= ntfsfix ntfsdump_logfile mkntfs ldm dumplog
 man_MANS		= mkntfs.8
 
@@ -22,8 +22,12 @@
 ntfsdump_logfile_LDFLAGS= $(all_libraries)
 
-mkntfs_SOURCES		= attrdef.c upcase.c boot.c sd.c mkntfs.c
+mkntfs_SOURCES		= attrdef.c upcase.c boot.c sd.c logfile.c mkntfs.c
 mkntfs_LDADD		= $(top_srcdir)/libntfs/libntfs.la
 mkntfs_LDFLAGS		= $(all_libraries)
 
 ldm_SOURCES		= ldm.c
+
+dumplog_SOURCES		= dumplog.c
+dumplog_LDADD		= $(top_srcdir)/libntfs/libntfs.la
+dumplog_LDFLAGS		= $(all_libraries)
 

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- Makefile.in	2001/06/11 19:11:37	1.8
+++ Makefile.in	2001/06/15 16:47:47	1.9
@@ -92,5 +92,5 @@
 @DEBUG_FALSE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64
 
-bin_PROGRAMS = ntfsfix ntfsdump_logfile mkntfs ldm
+bin_PROGRAMS = ntfsfix ntfsdump_logfile mkntfs ldm dumplog
 man_MANS = mkntfs.8
 
@@ -108,14 +108,18 @@
 ntfsdump_logfile_LDFLAGS = $(all_libraries)
 
-mkntfs_SOURCES = attrdef.c upcase.c boot.c sd.c mkntfs.c
+mkntfs_SOURCES = attrdef.c upcase.c boot.c sd.c logfile.c mkntfs.c
 mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la
 mkntfs_LDFLAGS = $(all_libraries)
 
 ldm_SOURCES = ldm.c
+
+dumplog_SOURCES = dumplog.c
+dumplog_LDADD = $(top_srcdir)/libntfs/libntfs.la
+dumplog_LDFLAGS = $(all_libraries)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES =  mkntfs.8
 bin_PROGRAMS =  ntfsfix$(EXEEXT) ntfsdump_logfile$(EXEEXT) \
-mkntfs$(EXEEXT) ldm$(EXEEXT)
+mkntfs$(EXEEXT) ldm$(EXEEXT) dumplog$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS)
 
@@ -128,5 +132,5 @@
 ntfsdump_logfile_DEPENDENCIES =  $(top_srcdir)/libntfs/libntfs.la
 mkntfs_OBJECTS =  attrdef.$(OBJEXT) upcase.$(OBJEXT) boot.$(OBJEXT) \
-sd.$(OBJEXT) mkntfs.$(OBJEXT)
+sd.$(OBJEXT) logfile.$(OBJEXT) mkntfs.$(OBJEXT)
 mkntfs_DEPENDENCIES =  $(top_srcdir)/libntfs/libntfs.la
 ldm_OBJECTS =  ldm.$(OBJEXT)
@@ -134,4 +138,6 @@
 ldm_DEPENDENCIES = 
 ldm_LDFLAGS = 
+dumplog_OBJECTS =  dumplog.$(OBJEXT)
+dumplog_DEPENDENCIES =  $(top_srcdir)/libntfs/libntfs.la
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -149,8 +155,9 @@
 TAR = gtar
 GZIP_ENV = --best
-DEP_FILES =  .deps/attrdef.P .deps/boot.P .deps/ldm.P .deps/mkntfs.P \
-.deps/ntfsdump_logfile.P .deps/ntfsfix.P .deps/sd.P .deps/upcase.P
-SOURCES = $(ntfsfix_SOURCES) $(ntfsdump_logfile_SOURCES) $(mkntfs_SOURCES) $(ldm_SOURCES)
-OBJECTS = $(ntfsfix_OBJECTS) $(ntfsdump_logfile_OBJECTS) $(mkntfs_OBJECTS) $(ldm_OBJECTS)
+DEP_FILES =  .deps/attrdef.P .deps/boot.P .deps/dumplog.P .deps/ldm.P \
+.deps/logfile.P .deps/mkntfs.P .deps/ntfsdump_logfile.P .deps/ntfsfix.P \
+.deps/sd.P .deps/upcase.P
+SOURCES = $(ntfsfix_SOURCES) $(ntfsdump_logfile_SOURCES) $(mkntfs_SOURCES) $(ldm_SOURCES) $(dumplog_SOURCES)
+OBJECTS = $(ntfsfix_OBJECTS) $(ntfsdump_logfile_OBJECTS) $(mkntfs_OBJECTS) $(ldm_OBJECTS) $(dumplog_OBJECTS)
 
 all: all-redirect
@@ -245,4 +252,8 @@
 	@rm -f ldm$(EXEEXT)
 	$(LINK) $(ldm_LDFLAGS) $(ldm_OBJECTS) $(ldm_LDADD) $(LIBS)
+
+dumplog$(EXEEXT): $(dumplog_OBJECTS) $(dumplog_DEPENDENCIES)
+	@rm -f dumplog$(EXEEXT)
+	$(LINK) $(dumplog_LDFLAGS) $(dumplog_OBJECTS) $(dumplog_LDADD) $(LIBS)
 
 install-man8:

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -U2 -r1.36 -r1.37
--- mkntfs.c	2001/06/13 19:00:56	1.36
+++ mkntfs.c	2001/06/15 16:47:47	1.37
@@ -105,4 +105,5 @@
 		int *sd_val_len);
 extern void init_upcase_table(uchar_t *uc, __u32 uc_len);
+extern void init_logfile(char *log_buf, __u32 log_buf_size);
 
 #define BLKGETSIZE	_IO(0x12,96)
@@ -3119,4 +3120,5 @@
 				strerror(errno));
 	memset(buf2, -1, opt.logfile_size);
+	init_logfile(buf2, opt.logfile_size);
 	err = add_attr_data_positioned(m, NULL, 0, 0, NULL, 0, 0, rl_logfile,
 			buf2, opt.logfile_size);