mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-03-11 02:21:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

* dir.c (do_sort): Correctly handle the case when there is no

Browse Source 
".." entry (i.e. panelized mode).
This commit is contained in:
Pavel Roskin 2001-11-14 20:32:47 +00:00
parent e50abb3f80
commit d62c8ee427
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2001-11-14 Pavel Roskin <proski@gnu.org>
* dir.c (do_sort): Correctly handle the case when there is no
".." entry (i.e. panelized mode).
2001-11-14 Andrew V. Samoilov <kai@cmail.ru> 2001-11-14 Andrew V. Samoilov <kai@cmail.ru>
* view.c (do_view_init): Make sure _file is not * view.c (do_view_init): Make sure _file is not

5
src/dir.c
View File

@ -316,10 +316,12 @@ void
do_sort (dir_list *list, sortfn *sort, int top, int reverse_f, int case_sensitive_f) do_sort (dir_list *list, sortfn *sort, int top, int reverse_f, int case_sensitive_f)
{ {
int i; int i;
int dot_dot_found = 0;
file_entry tmp_fe; file_entry tmp_fe;
for (i = 0; i < top + 1; i++) { /* put ".." first in list */ for (i = 0; i < top + 1; i++) { /* put ".." first in list */
if (!strcmp (list->list [i].fname, "..")) { if (!strcmp (list->list [i].fname, "..")) {
dot_dot_found = 1;
if (i > 0) { /* swap [i] and [0] */ if (i > 0) { /* swap [i] and [0] */
memcpy (&tmp_fe, &(list->list [0]), sizeof (file_entry)); memcpy (&tmp_fe, &(list->list [0]), sizeof (file_entry));
memcpy (&(list->list [0]), &(list->list [i]), sizeof (file_entry)); memcpy (&(list->list [0]), &(list->list [i]), sizeof (file_entry));
@ -331,7 +333,8 @@ do_sort (dir_list *list, sortfn *sort, int top, int reverse_f, int case_sensitiv
reverse = reverse_f ? -1 : 1; reverse = reverse_f ? -1 : 1;
case_sensitive = case_sensitive_f; case_sensitive = case_sensitive_f;
qsort (&(list->list) [1], top, sizeof (file_entry), sort); qsort (&(list->list) [dot_dot_found],
top + 1 - dot_dot_found, sizeof (file_entry), sort);
} }
void void