Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv25825/ntfstools
Modified Files:
mkntfs.c ntfsdump_logfile.c sd.c
Log Message:
Linux-NTFS 0.1.0-pre1
=====================
-fixed up ntfsfix and ntfsdump_logfile
-corrected stuff
-several bug fixes
-fixed (hopefully) final bug with mkntfs (sd generator was wrong due to brain'o)
-mkntfs now completed, only need to add a few command line options before first
public release.
-rpm generation file updated and autostrip modified to make use of install-stip
make target instead of stripping manually
-made bootsector check verbosity during mount dependent on --enable-debug
configure option.
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -U2 -r1.21 -r1.22
--- mkntfs.c 2001/06/10 14:00:12 1.21
+++ mkntfs.c 2001/06/10 15:54:20 1.22
@@ -3209,7 +3209,6 @@
if (!rl)
err_exit("decompress_run_list() failed\n");
- if (!opt.no_action)
- lw = ntfs_rlwrite(f, rl, lcn_bitmap,
- lcn_bitmap_byte_size, NULL);
+ lw = ntfs_rlwrite(f, rl, lcn_bitmap, lcn_bitmap_byte_size,
+ NULL);
if (lw != lcn_bitmap_byte_size)
err_exit("%s\n", lw == -1 ? strerror(errno) :
Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- ntfsdump_logfile.c 2001/06/01 02:07:26 1.7
+++ ntfsdump_logfile.c 2001/06/10 15:54:20 1.8
@@ -121,5 +121,5 @@
memset(&ctx, 0, sizeof(attr_search_context));
*(__u64*)&mref = FILE_$LogFile;
- if (read_file_record(vol, &mref, &m, NULL)) {
+ if (__read_file_record(vol, &mref, &m, NULL)) {
fprintf(stderr, "Error reading mft record for $LogFile.\n");
goto error_exit;
@@ -154,5 +154,14 @@
/* Check restart area. */
if (!is_rstr_recordp(lfd)) {
- puts("$LogFile contents are corrupt (magic RSTR missing)!");
+ __s64 _l;
+
+ for (_l = 0LL; _l < l; _l++)
+ if (lfd[_l] != (unsigned char)-1)
+ break;
+ if (_l < l)
+ puts("$LogFile contents are corrupt (magic RSTR "
+ "missing)!");
+ else
+ puts("$LogFile is empty.");
free(lfd);
goto log_file_error;
Index: sd.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/sd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- sd.c 2001/06/01 02:07:26 1.1
+++ sd.c 2001/06/10 15:54:20 1.2
@@ -75,5 +75,5 @@
* ACE of the DACL. The type of the ACE is access allowed.
*/
- aa_ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(acl));
+ aa_ace = (ACCESS_ALLOWED_ACE*)((char*)acl + sizeof(ACL));
aa_ace->type = ACCESS_ALLOWED_ACE_TYPE;
if (sys_file_no == FILE_$root)
|
