[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.24,1.25

[Yura P. <cha...@us...>]

Changes by: cha0smaster

Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25710/libntfs

Modified Files:
	dir.c 
Log Message:
fix stupid bug in ntfs_delete, optimize it a bit


Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- dir.c	24 Sep 2005 15:20:49 -0000	1.24
+++ dir.c	25 Sep 2005 14:12:44 -0000	1.25
@@ -1282,11 +1282,18 @@ search:
 		errno = 0;			
 		fn = (FILE_NAME_ATTR*)((u8*)actx->attr +
 				le16_to_cpu(actx->attr->value_offset));
-		if (looking_for_dos_name && fn->file_name_type == FILE_NAME_DOS)
-			break;
-		if (looking_for_win32_name &&
-				fn->file_name_type == FILE_NAME_WIN32)
-			break;
+		if (looking_for_dos_name) {
+			if (fn->file_name_type == FILE_NAME_DOS)
+				break;
+			else
+				continue;
+		}
+		if (looking_for_win32_name) {
+			if  (fn->file_name_type == FILE_NAME_WIN32)
+				break;
+			else
+				continue;
+		}
 		if (dir_ni->mft_no == MREF_LE(fn->parent_directory) &&
 				ntfs_names_are_equal(fn->file_name,
 				fn->file_name_length, name,
@@ -1295,7 +1302,6 @@ search:
 				ni->vol->upcase, ni->vol->upcase_len)) {
 			if (fn->file_name_type == FILE_NAME_WIN32) {
 				looking_for_dos_name = TRUE;
-				ntfs_attr_reinit_search_ctx(actx);
 				continue;
 			}
 			if (fn->file_name_type == FILE_NAME_DOS)