[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools Makefile.am,1.2,1.3 ntfsdump_logfile.c,1.2,1.3 ntfsfix.c,1.5,1.6

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

Changes by: antona

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

Modified Files:
	Makefile.am ntfsdump_logfile.c ntfsfix.c 
Log Message:
Full commit of my current dircetory. New files not yet added.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am	2001/02/03 02:03:36	1.2
--- Makefile.am	2001/03/02 15:06:37	1.3
***************
*** 1,17 ****
! bin_PROGRAMS		= ntfsfix ntfsdump_logfile
  
  linux_ntfsincludedir	= -I$(top_srcdir)/include
  
  ntfsfix_SOURCES		= ntfsfix.c
  ntfsfix_LDADD		= $(top_srcdir)/libntfs/libntfs.la
  
  ntfsdump_logfile_SOURCES= ntfsdump_logfile.c
  ntfsdump_logfile_LDADD	= $(top_srcdir)/libntfs/libntfs.la
- 
- # Set the include path.
- INCLUDES		= -I$(top_srcdir)/include $(all_includes)
- 
- # The library search path.
- ntfsfix_LDFLAGS		= $(all_libraries)
  ntfsdump_logfile_LDFLAGS= $(all_libraries)
  
--- 1,19 ----
! bin_PROGRAMS		= ntfsfix ntfsdump_logfile mkntfs
  
  linux_ntfsincludedir	= -I$(top_srcdir)/include
  
+ # Set the include path.
+ INCLUDES		= -I$(top_srcdir)/include $(all_includes)
+ 
  ntfsfix_SOURCES		= ntfsfix.c
  ntfsfix_LDADD		= $(top_srcdir)/libntfs/libntfs.la
+ ntfsfix_LDFLAGS		= $(all_libraries)
  
  ntfsdump_logfile_SOURCES= ntfsdump_logfile.c
  ntfsdump_logfile_LDADD	= $(top_srcdir)/libntfs/libntfs.la
  ntfsdump_logfile_LDFLAGS= $(all_libraries)
+ 
+ mkntfs_SOURCES		= mkntfs.c
+ mkntfs_LDADD		= $(top_srcdir)/libntfs/libntfs.la
+ mkntfs_LDFLAGS		= $(all_libraries)
  

Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ntfsdump_logfile.c	2001/02/02 00:16:18	1.2
--- ntfsdump_logfile.c	2001/03/02 15:06:37	1.3
***************
*** 138,142 ****
  	/* Find the $DATA attribute of the $LogFile. */
  	a = (NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)
! 		find_attribute((MFT_RECORD_HEADER*)b1, $DATA, NULL);
  	if (!a) {
  		fprintf(stderr, "Error: Attribute $DATA was not found in" \
--- 138,142 ----
  	/* Find the $DATA attribute of the $LogFile. */
  	a = (NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)
! 		find_first_attr(vol, (MFT_RECORD_HEADER*)b1, $DATA, NULL);
  	if (!a) {
  		fprintf(stderr, "Error: Attribute $DATA was not found in" \

Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ntfsfix.c	2001/02/03 04:21:49	1.5
--- ntfsfix.c	2001/03/02 15:06:37	1.6
***************
*** 334,338 ****
  	/* Find the $DATA attribute. */
  	a = (NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)
! 		find_attribute((MFT_RECORD_HEADER*)(b1+(2*mrs)), $DATA, NULL);
  	if (!a) {
  		puts(FAILED);
--- 334,339 ----
  	/* Find the $DATA attribute. */
  	a = (NONRESIDENT_ATTRIBUTE_RECORD_HEADER*)
! 		find_first_attr(vol, (MFT_RECORD_HEADER*)(b1+(2*mrs)), $DATA,
! 				NULL);
  	if (!a) {
  		puts(FAILED);