mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

1999-04-25 Sergei Ivanov <svivanov@pdmi.ras.ru>

Browse Source 
* find.c: The origin of the bug is in the function do_search (file
	find.c).  It limits the number of subdirectories to scan by the
	number stat.st_nlink-2, or infinite if st_nlink<2. On tar vfs,
	st_nlink is always 1, so it should be the second case.

	But before doing stat, do_search does opendir. And opendir on tar
	vfs (vfs_s_opendir in vfs/direntry.c) increases the st_nlink value
	in the stat data! So mc_stat called after mc_opendir on tar vfs
	returns st_nlink==2 instead of 1. This is interpreted as if the
	directory had no subdirs, thus subdirs are not searched in.

	Changing the order of calls to mc_stat and mc_opendir fixes the
	problem.
This commit is contained in:
Miguel de Icaza 1999-04-25 19:57:53 +00:00
parent 449bee9014
commit d8c040ccb0
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ChangeLog
View File

@ -1,3 +1,23 @@
1999-04-25 Sergei Ivanov <svivanov@pdmi.ras.ru>
* find.c: The origin of the bug is in the function do_search (file
find.c). It limits the number of subdirectories to scan by the
number stat.st_nlink-2, or infinite if st_nlink<2. On tar vfs,
st_nlink is always 1, so it should be the second case.
But before doing stat, do_search does opendir. And opendir on tar
vfs (vfs_s_opendir in vfs/direntry.c) increases the st_nlink value
in the stat data! So mc_stat called after mc_opendir on tar vfs
returns st_nlink==2 instead of 1. This is interpreted as if the
directory had no subdirs, thus subdirs are not searched in.
Changing the order of calls to mc_stat and mc_opendir fixes the
problem.
1999-03-25 Miguel de Icaza <miguel@nuclecu.unam.mx>
* setup.c (save_setup): Only save this if there is a current panel
Wed Apr 21 21:47:15 1999 Norbert Warmuth <nwarmuth@privat.circular.de>
* ext.c (exec_extension): Use tempnam instead of tmpnam (AIX doesn't
@ -22,6 +42,7 @@ Wed Apr 21 20:19:45 1999 Norbert Warmuth <nwarmuth@privat.circular.de>
* main.c (main): call (init|done)_textmode_x11_support
>>>>>>> 1.297
Sat Apr 17 13:04:19 1999 Norbert Warmuth <nwarmuth@privat.circular.de>
* view.c (do_view_init): Enable viewing of files with negative

5
src/find.c
View File

@ -561,13 +561,16 @@ do_search (struct Dlg_head *h)
g_snprintf (buffer, sizeof (buffer), _("Searching %s"), name_trunc (directory, FIND2_X_USE));
status_update (buffer);
}
dirp = mc_opendir (directory);
/* mc_stat should not be called after mc_opendir
because vfs_s_opendir modifies the st_nlink
*/
mc_stat (directory, &tmp_stat);
subdirs_left = tmp_stat.st_nlink - 2;
/* Commented out as unnecessary
if (subdirs_left < 0)
subdirs_left = MAXINT;
*/
dirp = mc_opendir (directory);
}
dp = mc_readdir (dirp);
}