[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools Makefile.am,1.25,1.26 Makefile.in,1.31,1.32 dumplog.c,1.7,1.8 ntfsdump_logfile.c,1.22,1.23

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

Changes by: antona

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

Modified Files:
	Makefile.am Makefile.in dumplog.c ntfsdump_logfile.c 
Log Message:
Cleanup the build process a bit.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -U2 -r1.25 -r1.26
--- Makefile.am	3 Jul 2002 12:55:52 -0000	1.25
+++ Makefile.am	3 Jul 2002 14:38:40 -0000	1.26
@@ -6,9 +6,12 @@
 endif
 
-EXTRA_PROGRAMS		= ntfsundelete ntfsdump_logfile dumplog
-CLEANFILES		= $(EXTRA_PROGRAMS)
 bin_PROGRAMS		= ntfsfix ntfsinfo
 sbin_PROGRAMS		= mkntfs ntfslabel
-man_MANS		= mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 #ntfsundelete.8
+EXTRA_PROGRAMS		= ntfsundelete ntfsdump_logfile dumplog
+
+man_MANS		= mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8
+EXTRA_MANS		= ntfsundelete.8
+
+CLEANFILES		= $(EXTRA_PROGRAMS)
 
 linux_ntfsincludedir	= -I$(top_srcdir)/include

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -U2 -r1.31 -r1.32
--- Makefile.in	3 Jul 2002 12:55:52 -0000	1.31
+++ Makefile.in	3 Jul 2002 14:38:40 -0000	1.32
@@ -92,9 +92,12 @@
 @DEBUG_FALSE@AM_CFLAGS = @DEBUG_FALSE@-D_FILE_OFFSET_BITS=64
 
-EXTRA_PROGRAMS = ntfsundelete ntfsdump_logfile dumplog
-CLEANFILES = $(EXTRA_PROGRAMS)
 bin_PROGRAMS = ntfsfix ntfsinfo
 sbin_PROGRAMS = mkntfs ntfslabel
-man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 #ntfsundelete.8
+EXTRA_PROGRAMS = ntfsundelete ntfsdump_logfile dumplog
+
+man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8
+EXTRA_MANS = ntfsundelete.8
+
+CLEANFILES = $(EXTRA_PROGRAMS)
 
 linux_ntfsincludedir = -I$(top_srcdir)/include
@@ -135,5 +138,6 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES =  mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8
+CONFIG_CLEAN_FILES =  mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \
+ntfsundelete.8
 bin_PROGRAMS =  ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT)
 sbin_PROGRAMS =  mkntfs$(EXEEXT) ntfslabel$(EXEEXT)
@@ -167,5 +171,5 @@
 NROFF = nroff
 DIST_COMMON =  Makefile.am Makefile.in mkntfs.8.in ntfsfix.8.in \
-ntfsinfo.8.in ntfslabel.8.in
+ntfsinfo.8.in ntfslabel.8.in ntfsundelete.8.in
 
 
@@ -197,4 +201,6 @@
 	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 ntfsinfo.8: $(top_builddir)/config.status ntfsinfo.8.in
+	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ntfsundelete.8: $(top_builddir)/config.status ntfsundelete.8.in
 	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 

Index: dumplog.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/dumplog.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- dumplog.c	2 Jul 2002 23:47:11 -0000	1.7
+++ dumplog.c	3 Jul 2002 14:38:40 -0000	1.8
@@ -95,5 +95,6 @@
 	if (l > 0x400000LL) {
 		printf("Only analysing the first four megabytes of the "
-				"logfile.\n", l);
+				"logfile (real size = 0x%Lx).\n",
+				(unsigned long long)l);
 		l = 0x400000LL;
 	}
@@ -287,5 +288,5 @@
 		printf("Array of lcns:\n");
 	for (i = 0; i < le16_to_cpu(lr->lcns_to_follow); i++)
-		printf("lcn_list[%i].lcn = 0x%Lx\n",
+		printf("lcn_list[%i].lcn = 0x%Lx\n", i,
 				sle64_to_cpu(lr->lcn_list[i].lcn));
 	client++;
@@ -301,5 +302,4 @@
 	/* Set return code to 0. */
 	i = 0;
-final_exit:
 	if (lfd)
 		free(lfd);
@@ -307,7 +307,4 @@
 		close(f);
 	return i;
-error_exit:
-	i = 1;
-	goto final_exit;
 }
 

Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -U2 -r1.22 -r1.23
--- ntfsdump_logfile.c	3 Jul 2002 11:30:07 -0000	1.22
+++ ntfsdump_logfile.c	3 Jul 2002 14:38:40 -0000	1.23
@@ -57,4 +57,5 @@
 #include "disk_io.h"
 #include "logfile.h"
+#include "mst.h"
 
 int main(int argc, char **argv)
@@ -337,5 +338,5 @@
 		printf("Array of lcns:\n");
 	for (i = 0; i < le16_to_cpu(lr->lcns_to_follow); i++)
-		printf("lcn_list[%i].lcn = 0x%Lx\n",
+		printf("lcn_list[%i].lcn = 0x%Lx\n", i,
 				sle64_to_cpu(lr->lcn_list[i].lcn));
 	client++;