Changes by: antona
Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11789/ntfsprogs
Modified Files:
Makefile.in ntfscp.c ntfsundelete.c utils.c
Log Message:
Eeek. Someone did a commit just as I was about to commit so the commit
message was lost! )-:
Now again...
Monster commit from me due to lack of time. Sorry about that.
Features:
- Version to 1.10.0
- Update readme, etc ready for release.
- Update build system to suse linux 9.3 versions.
- Fix warnings appearing for me on suse 9.3 with --enable-warnings --enable-debug.
- Set attr_name to NULL in libntfs/attrib.c::__ntfs_attr_init() and fixup all
callers apropriately. Thanks to FlatCap/Rich for pointing this out.
- Determine endianness in ./configure and use that in addition to existing
mechanisms for determining endianness.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.in,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- Makefile.in 6 Jun 2005 14:31:42 -0000 1.70
+++ Makefile.in 20 Jun 2005 14:31:59 -0000 1.71
@@ -225,7 +225,6 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Index: ntfscp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ntfscp.c 19 Jun 2005 21:09:41 -0000 1.20
+++ ntfscp.c 20 Jun 2005 14:31:59 -0000 1.21
@@ -2,6 +2,7 @@
* ntfscp - Part of the Linux-NTFS project.
*
* Copyright (c) 2004-2005 Yura Pakhuchiy
+ * Copyright (c) 2005 Anton Altaparmakov
*
* This utility will overwrite files on ntfs volume
*
@@ -267,7 +268,7 @@ int main (int argc, char *argv[])
u64 offset;
char *buf;
s64 br, bw;
- ntfschar *attr_name = NULL;
+ ntfschar *attr_name = AT_UNNAMED;
int attr_name_len = 0;
if (!parse_options(argc, argv))
Index: ntfsundelete.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ntfsundelete.c 19 Jun 2005 21:09:41 -0000 1.39
+++ ntfsundelete.c 20 Jun 2005 14:31:59 -0000 1.40
@@ -3,6 +3,7 @@
*
* Copyright (c) 2002-2005 Richard Russon
* Copyright (c) 2004-2005 Holger Ohmacht
+ * Copyright (c) 2005 Anton Altaparmakov
*
* This utility will recover deleted files from an NTFS volume.
*
@@ -793,7 +794,7 @@ static void get_parent_name (struct file
return;
}
- mft_data = ntfs_attr_open(vol->mft_ni, AT_DATA, NULL, 0);
+ mft_data = ntfs_attr_open(vol->mft_ni, AT_DATA, AT_UNNAMED, 0);
if (!mft_data) {
Eprintf ("ERROR: Couldn't open $MFT/$DATA: %s\n", strerror (errno));
} else {
@@ -1025,7 +1026,7 @@ static struct ufile * read_record (ntfs_
return NULL;
}
- mft = ntfs_attr_open (vol->mft_ni, AT_DATA, NULL, 0);
+ mft = ntfs_attr_open (vol->mft_ni, AT_DATA, AT_UNNAMED, 0);
if (!mft) {
Eprintf ("ERROR: Couldn't open $MFT/$DATA: %s\n", strerror (errno));
free_file (file);
@@ -1947,7 +1948,7 @@ static int copy_mft (ntfs_volume *vol, l
return 1;
}
- mft = ntfs_attr_open (vol->mft_ni, AT_DATA, NULL, 0);
+ mft = ntfs_attr_open (vol->mft_ni, AT_DATA, AT_UNNAMED, 0);
if (!mft) {
Eprintf ("Couldn't open $MFT/$DATA: %s\n", strerror (errno));
goto free;
Index: utils.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- utils.c 12 Jun 2005 18:12:56 -0000 1.34
+++ utils.c 20 Jun 2005 14:31:59 -0000 1.35
@@ -2,7 +2,7 @@
* utils.c - Part of the Linux-NTFS project.
*
* Copyright (c) 2002-2004 Richard Russon
- * Copyright (c) 2003-2004 Anton Altaparmakov
+ * Copyright (c) 2003-2005 Anton Altaparmakov
* Copyright (c) 2003 Lode Leroy
*
* A set of shared functions for ntfs utilities
@@ -619,7 +619,7 @@ int utils_cluster_in_use (ntfs_volume *v
/* Does lcn lie in the section of $Bitmap we already have cached? */
if ((lcn < bmplcn) || (lcn >= (bmplcn + (sizeof (buffer) << 3)))) {
Dprintf ("Bit lies outside cache.\n");
- attr = ntfs_attr_open (vol->lcnbmp_ni, AT_DATA, NULL, 0);
+ attr = ntfs_attr_open (vol->lcnbmp_ni, AT_DATA, AT_UNNAMED, 0);
if (!attr) {
Eprintf ("Couldn't open $Bitmap: %s\n", strerror (errno));
return -1;
@@ -967,7 +967,8 @@ int mft_next_record (struct mft_search_c
return -1;
}
- mft = ntfs_attr_open (ctx->vol->mft_ni, AT_DATA, NULL, 0);
+ mft = ntfs_attr_open (ctx->vol->mft_ni, AT_DATA,
+ AT_UNNAMED, 0);
if (!mft) {
Eprintf ("Couldn't open $MFT/$DATA: %s\n", strerror (errno));
// free / close
|