1998-02-27 07:54:42 +03:00
|
|
|
/* Directory routines
|
|
|
|
Copyright (C) 1994 Miguel de Icaza.
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
2000-08-23 02:50:00 +04:00
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
1998-02-27 07:54:42 +03:00
|
|
|
|
|
|
|
#include <config.h>
|
1998-12-15 22:53:55 +03:00
|
|
|
#define DIR_H_INCLUDE_HANDLE_DIRENT
|
1998-02-27 07:54:42 +03:00
|
|
|
#include <string.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <sys/stat.h>
|
2001-09-07 21:52:19 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
#include "global.h"
|
2001-09-07 21:52:19 +04:00
|
|
|
#include "tty.h"
|
1998-02-27 07:54:42 +03:00
|
|
|
#include "dir.h"
|
1998-12-03 00:27:27 +03:00
|
|
|
#include "dialog.h"
|
1998-02-27 07:54:42 +03:00
|
|
|
#include "tree.h"
|
|
|
|
#include "../vfs/vfs.h"
|
|
|
|
|
|
|
|
/* "$Id$" */
|
|
|
|
|
2001-11-15 02:20:37 +03:00
|
|
|
/* If true show files starting with a dot */
|
1998-02-27 07:54:42 +03:00
|
|
|
int show_dot_files = 1;
|
|
|
|
|
|
|
|
/* If true show files ending in ~ */
|
2002-01-17 08:42:00 +03:00
|
|
|
int show_backups = 1;
|
1998-02-27 07:54:42 +03:00
|
|
|
|
|
|
|
/* If false then directories are shown separately from files */
|
|
|
|
int mix_all_files = 0;
|
|
|
|
|
|
|
|
/* Reverse flag */
|
|
|
|
static int reverse = 1;
|
|
|
|
|
|
|
|
/* Are the files sorted case sensitively? */
|
|
|
|
static int case_sensitive = OS_SORT_CASE_SENSITIVE_DEFAULT;
|
|
|
|
|
|
|
|
#define MY_ISDIR(x) ( (S_ISDIR (x->buf.st_mode) || x->f.link_to_dir) ? 1 : 0)
|
|
|
|
|
|
|
|
sort_orders_t sort_orders [SORT_TYPES_TOTAL] = {
|
Fri Apr 3 05:23:20 1998 Alex Tkachenko <alex@bcs.zp.ua>
* configure.in: ALL_LINGUAS test added, to allow specify list
of languages to be installed by setting env variable before
configure. If it is empty, it defaults to full list.
* src/menu.h menu_entry.{hot_pos, is_dupped} dropped
* src/menu.c: consistency fixes: pull-down menu items are now
accessible either with arrow keys or with hotkeys, denoted with &
(and highlighted). (key combinations, placed to the right of items
intended to be used from outside the menus). Freeing menu entries
removed as it no longer needed
* src/main.c, edit/editmenu.c: menubar init code is changed to conform
above fixes.
* edit/edit.h: use of "Cancel" in error_dialogs replaced with
"Dismiss", to avoid collisions in translation of "Cancel" in other
places with this case.
* src/boxes.c: select_format() and it's support removed, as it is
obsoleted by input line history feature. display_init()/display_callback
fixed to suite i18n changes. sort_box() - alike.
* src/option.c: pause_options added &'s and gettext calls to expand
statically assigned values.
* src/widget.c: (radio_callback) hotkey recognition is changed to
&-notation, rather than simple uppercase.
* src/dlg.c: (dlg_try_hotkey) plain symbol comparison replaced with
call to isalpha(), this fixes errorneous exit from input line, when
button hotkey is 8-bit NLS char.
1998-04-04 00:00:00 +04:00
|
|
|
{ N_("&Unsorted"), unsorted },
|
|
|
|
{ N_("&Name"), sort_name },
|
|
|
|
{ N_("&Extension"), sort_ext },
|
|
|
|
{ N_("&Modify time"), sort_time },
|
|
|
|
{ N_("&Access time"), sort_atime },
|
|
|
|
{ N_("&Change time"), sort_ctime },
|
|
|
|
{ N_("&Size"), sort_size },
|
|
|
|
{ N_("&Inode"), sort_inode },
|
1998-02-27 07:54:42 +03:00
|
|
|
|
|
|
|
/* New sort orders */
|
Fri Apr 3 05:23:20 1998 Alex Tkachenko <alex@bcs.zp.ua>
* configure.in: ALL_LINGUAS test added, to allow specify list
of languages to be installed by setting env variable before
configure. If it is empty, it defaults to full list.
* src/menu.h menu_entry.{hot_pos, is_dupped} dropped
* src/menu.c: consistency fixes: pull-down menu items are now
accessible either with arrow keys or with hotkeys, denoted with &
(and highlighted). (key combinations, placed to the right of items
intended to be used from outside the menus). Freeing menu entries
removed as it no longer needed
* src/main.c, edit/editmenu.c: menubar init code is changed to conform
above fixes.
* edit/edit.h: use of "Cancel" in error_dialogs replaced with
"Dismiss", to avoid collisions in translation of "Cancel" in other
places with this case.
* src/boxes.c: select_format() and it's support removed, as it is
obsoleted by input line history feature. display_init()/display_callback
fixed to suite i18n changes. sort_box() - alike.
* src/option.c: pause_options added &'s and gettext calls to expand
statically assigned values.
* src/widget.c: (radio_callback) hotkey recognition is changed to
&-notation, rather than simple uppercase.
* src/dlg.c: (dlg_try_hotkey) plain symbol comparison replaced with
call to isalpha(), this fixes errorneous exit from input line, when
button hotkey is 8-bit NLS char.
1998-04-04 00:00:00 +04:00
|
|
|
{ N_("&Type"), sort_type },
|
|
|
|
{ N_("&Links"), sort_links },
|
|
|
|
{ N_("N&GID"), sort_ngid },
|
|
|
|
{ N_("N&UID"), sort_nuid },
|
|
|
|
{ N_("&Owner"), sort_owner },
|
|
|
|
{ N_("&Group"), sort_group }
|
1998-02-27 07:54:42 +03:00
|
|
|
};
|
|
|
|
|
2001-08-12 12:20:31 +04:00
|
|
|
#ifdef HAVE_STRCOLL
|
2001-01-27 08:51:26 +03:00
|
|
|
/*
|
2001-08-12 12:20:31 +04:00
|
|
|
* g_strcasecmp() doesn't work well in some locales because it relies on
|
|
|
|
* the locale-specific toupper(). On the other hand, strcoll() is case
|
|
|
|
* sensitive in the "C" and "POSIX" locales, unlike other locales.
|
|
|
|
* Solution: always use strcmp() for case sensitive sort. For case
|
|
|
|
* insensitive sort use strcoll() if it's case insensitive for ASCII and
|
|
|
|
* g_strcasecmp() otherwise.
|
2001-01-27 08:51:26 +03:00
|
|
|
*/
|
2001-08-12 12:20:31 +04:00
|
|
|
typedef enum {
|
|
|
|
STRCOLL_NO,
|
|
|
|
STRCOLL_YES,
|
|
|
|
STRCOLL_TEST
|
|
|
|
} strcoll_status;
|
|
|
|
|
2001-12-04 00:39:41 +03:00
|
|
|
static int string_sortcomp (char *str1, char *str2)
|
2001-08-12 12:20:31 +04:00
|
|
|
{
|
|
|
|
static strcoll_status use_strcoll = STRCOLL_TEST;
|
|
|
|
|
|
|
|
if (case_sensitive) {
|
|
|
|
return strcmp (str1, str2);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Initialize use_strcoll once. */
|
|
|
|
if (use_strcoll == STRCOLL_TEST) {
|
|
|
|
/* Only use strcoll() if it considers "B" between "a" and "c". */
|
|
|
|
if (strcoll ("a", "B") * strcoll ("B", "c") > 0) {
|
|
|
|
use_strcoll = STRCOLL_YES;
|
|
|
|
} else {
|
|
|
|
use_strcoll = STRCOLL_NO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (use_strcoll == STRCOLL_NO)
|
|
|
|
return g_strcasecmp (str1, str2);
|
|
|
|
else
|
|
|
|
return strcoll (str1, str2);
|
|
|
|
}
|
2001-01-27 08:51:26 +03:00
|
|
|
#else
|
|
|
|
#define string_sortcomp(a,b) (case_sensitive ? strcmp (a,b) : g_strcasecmp (a,b))
|
|
|
|
#endif
|
1998-02-27 07:54:42 +03:00
|
|
|
|
|
|
|
int
|
|
|
|
unsorted (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
sort_name (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
int ad = MY_ISDIR (a);
|
|
|
|
int bd = MY_ISDIR (b);
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
if (ad == bd || mix_all_files)
|
|
|
|
return string_sortcomp (a->fname, b->fname) * reverse;
|
|
|
|
return bd-ad;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
sort_ext (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
char *exta, *extb;
|
|
|
|
int r;
|
|
|
|
int ad = MY_ISDIR (a);
|
|
|
|
int bd = MY_ISDIR (b);
|
|
|
|
|
|
|
|
if (ad == bd || mix_all_files){
|
|
|
|
exta = extension (a->fname);
|
|
|
|
extb = extension (b->fname);
|
|
|
|
r = string_sortcomp (exta, extb);
|
|
|
|
if (r)
|
|
|
|
return r * reverse;
|
|
|
|
else
|
|
|
|
return sort_name (a, b);
|
|
|
|
} else
|
|
|
|
return bd-ad;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
sort_owner (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
int ad = MY_ISDIR (a);
|
|
|
|
int bd = MY_ISDIR (b);
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
if (ad == bd || mix_all_files)
|
|
|
|
return string_sortcomp (get_owner (a->buf.st_uid), get_owner (a->buf.st_uid)) * reverse;
|
|
|
|
return bd-ad;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
sort_group (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
int ad = MY_ISDIR (a);
|
|
|
|
int bd = MY_ISDIR (b);
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
if (ad == bd || mix_all_files)
|
|
|
|
return string_sortcomp (get_group (a->buf.st_gid), get_group (a->buf.st_gid)) * reverse;
|
|
|
|
return bd-ad;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
sort_time (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
int ad = MY_ISDIR (a);
|
|
|
|
int bd = MY_ISDIR (b);
|
|
|
|
|
|
|
|
if (ad == bd || mix_all_files)
|
|
|
|
return (a->buf.st_mtime - b->buf.st_mtime) * reverse;
|
|
|
|
else
|
|
|
|
return bd-ad;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
sort_ctime (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
int ad = MY_ISDIR (a);
|
|
|
|
int bd = MY_ISDIR (b);
|
|
|
|
|
|
|
|
if (ad == bd || mix_all_files)
|
|
|
|
return (a->buf.st_ctime - b->buf.st_ctime) * reverse;
|
|
|
|
else
|
|
|
|
return bd-ad;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
sort_atime (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
int ad = MY_ISDIR (a);
|
|
|
|
int bd = MY_ISDIR (b);
|
|
|
|
|
|
|
|
if (ad == bd || mix_all_files)
|
|
|
|
return (a->buf.st_atime - b->buf.st_atime) * reverse;
|
|
|
|
else
|
|
|
|
return bd-ad;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
sort_inode (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
int ad = MY_ISDIR (a);
|
|
|
|
int bd = MY_ISDIR (b);
|
|
|
|
|
|
|
|
if (ad == bd || mix_all_files)
|
|
|
|
return (a->buf.st_ino - b->buf.st_ino) * reverse;
|
|
|
|
else
|
|
|
|
return bd-ad;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
sort_size (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
int ad = MY_ISDIR (a);
|
|
|
|
int bd = MY_ISDIR (b);
|
|
|
|
|
|
|
|
if (ad == bd || mix_all_files)
|
|
|
|
return (b->buf.st_size - a->buf.st_size) * reverse;
|
|
|
|
else
|
|
|
|
return bd-ad;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
sort_links (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
int ad = MY_ISDIR (a);
|
|
|
|
int bd = MY_ISDIR (b);
|
|
|
|
|
|
|
|
if (ad == bd || mix_all_files)
|
|
|
|
return (b->buf.st_nlink - a->buf.st_nlink) * reverse;
|
|
|
|
else
|
|
|
|
return bd-ad;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
sort_ngid (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
int ad = MY_ISDIR (a);
|
|
|
|
int bd = MY_ISDIR (b);
|
|
|
|
|
|
|
|
if (ad == bd || mix_all_files)
|
|
|
|
return (b->buf.st_gid - a->buf.st_gid) * reverse;
|
|
|
|
else
|
|
|
|
return bd-ad;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
sort_nuid (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
int ad = MY_ISDIR (a);
|
|
|
|
int bd = MY_ISDIR (b);
|
|
|
|
|
|
|
|
if (ad == bd || mix_all_files)
|
|
|
|
return (b->buf.st_uid - a->buf.st_uid) * reverse;
|
|
|
|
else
|
|
|
|
return bd-ad;
|
|
|
|
}
|
|
|
|
|
|
|
|
inline static int
|
|
|
|
file_type_to_num (const file_entry *fe)
|
|
|
|
{
|
|
|
|
const struct stat *s = &fe->buf;
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
if (S_ISDIR (s->st_mode))
|
|
|
|
return 0;
|
|
|
|
if (S_ISLNK (s->st_mode)){
|
|
|
|
if (fe->f.link_to_dir)
|
|
|
|
return 1;
|
|
|
|
if (fe->f.stalled_link)
|
|
|
|
return 2;
|
|
|
|
else
|
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
if (S_ISSOCK (s->st_mode))
|
|
|
|
return 4;
|
|
|
|
if (S_ISCHR (s->st_mode))
|
|
|
|
return 5;
|
|
|
|
if (S_ISBLK (s->st_mode))
|
|
|
|
return 6;
|
|
|
|
if (S_ISFIFO (s->st_mode))
|
|
|
|
return 7;
|
|
|
|
if (is_exe (s->st_mode))
|
|
|
|
return 8;
|
|
|
|
return 9;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
sort_type (const file_entry *a, const file_entry *b)
|
|
|
|
{
|
|
|
|
int aa = file_type_to_num (a);
|
|
|
|
int bb = file_type_to_num (b);
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
return bb-aa;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
do_sort (dir_list *list, sortfn *sort, int top, int reverse_f, int case_sensitive_f)
|
|
|
|
{
|
|
|
|
int i;
|
2001-11-14 23:32:47 +03:00
|
|
|
int dot_dot_found = 0;
|
1998-02-27 07:54:42 +03:00
|
|
|
file_entry tmp_fe;
|
|
|
|
|
|
|
|
for (i = 0; i < top + 1; i++) { /* put ".." first in list */
|
|
|
|
if (!strcmp (list->list [i].fname, "..")) {
|
2001-11-14 23:32:47 +03:00
|
|
|
dot_dot_found = 1;
|
1998-02-27 07:54:42 +03:00
|
|
|
if (i > 0) { /* swap [i] and [0] */
|
|
|
|
memcpy (&tmp_fe, &(list->list [0]), sizeof (file_entry));
|
|
|
|
memcpy (&(list->list [0]), &(list->list [i]), sizeof (file_entry));
|
|
|
|
memcpy (&(list->list [i]), &tmp_fe, sizeof (file_entry));
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
reverse = reverse_f ? -1 : 1;
|
|
|
|
case_sensitive = case_sensitive_f;
|
2001-11-14 23:32:47 +03:00
|
|
|
qsort (&(list->list) [dot_dot_found],
|
|
|
|
top + 1 - dot_dot_found, sizeof (file_entry), sort);
|
1998-02-27 07:54:42 +03:00
|
|
|
}
|
|
|
|
|
1999-02-18 03:07:26 +03:00
|
|
|
void
|
|
|
|
clean_dir (dir_list *list, int count)
|
1998-02-27 07:54:42 +03:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++){
|
Glibing..... (2)
Wed Jan 27 03:17:44 1999 Timur Bakeyev <mc@bat.ru>
* Converted memory managment to Glib. Now we use g_new()/g_malloc()/
g_strdup()/g_free() routings. Also, copy_strings() replaced by
g_strconcat(), strcasecmp() -> g_strcasecmp(),and sprintf() by
g_snprintf().
* Some sequences of malloc()/sprintf() changed to g_strdup_printf().
* mad.[ch]: Modified, to work with new GLib's memory managment. Fixed
a missing #undef for tempnam, which caused dead loop. Add several new
functions to emulate GLib memory managment.
*main.c, mad.[ch]: Add a new switch "-M", which allows to redirect MAD
messages to the file.
* util.[ch], utilunix.c: Modified, deleted our variants of strcasecmp()
and strdup() - we have g_ equivalences. Remove get_full_name() - it is
similar to concat_dir_and_file(). Some other tricks with g_* functions.
* global.h: Modified, extended. Now it is main memory mangment include -
i.e. all inclusions of <stdlib.h>, <malloc.h>, <glib.h>, "fs.h", "mem.h",
"util.h" and "mad.h" done there. This elimanates problem with proper or-
der of #include's.
* All around the source - changed order of #include's, most of them gone
to global.h (see above), minor changes, like "0" -> NULL in string func-
tions.
1999-01-27 04:08:30 +03:00
|
|
|
g_free (list->list [i].fname);
|
1998-02-27 07:54:42 +03:00
|
|
|
list->list [i].fname = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-08-27 09:01:08 +04:00
|
|
|
static int
|
1998-02-27 07:54:42 +03:00
|
|
|
add_dotdot_to_list (dir_list *list, int index)
|
|
|
|
{
|
|
|
|
char buffer [MC_MAXPATHLEN + MC_MAXPATHLEN];
|
1998-05-26 04:53:24 +04:00
|
|
|
char *p;
|
1998-02-27 07:54:42 +03:00
|
|
|
int i = 0;
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
/* Need to grow the *list? */
|
|
|
|
if (index == list->size) {
|
Glibing..... (2)
Wed Jan 27 03:17:44 1999 Timur Bakeyev <mc@bat.ru>
* Converted memory managment to Glib. Now we use g_new()/g_malloc()/
g_strdup()/g_free() routings. Also, copy_strings() replaced by
g_strconcat(), strcasecmp() -> g_strcasecmp(),and sprintf() by
g_snprintf().
* Some sequences of malloc()/sprintf() changed to g_strdup_printf().
* mad.[ch]: Modified, to work with new GLib's memory managment. Fixed
a missing #undef for tempnam, which caused dead loop. Add several new
functions to emulate GLib memory managment.
*main.c, mad.[ch]: Add a new switch "-M", which allows to redirect MAD
messages to the file.
* util.[ch], utilunix.c: Modified, deleted our variants of strcasecmp()
and strdup() - we have g_ equivalences. Remove get_full_name() - it is
similar to concat_dir_and_file(). Some other tricks with g_* functions.
* global.h: Modified, extended. Now it is main memory mangment include -
i.e. all inclusions of <stdlib.h>, <malloc.h>, <glib.h>, "fs.h", "mem.h",
"util.h" and "mad.h" done there. This elimanates problem with proper or-
der of #include's.
* All around the source - changed order of #include's, most of them gone
to global.h (see above), minor changes, like "0" -> NULL in string func-
tions.
1999-01-27 04:08:30 +03:00
|
|
|
list->list = g_realloc (list->list, sizeof (file_entry) *
|
1998-02-27 07:54:42 +03:00
|
|
|
(list->size + RESIZE_STEPS));
|
|
|
|
if (!list->list)
|
|
|
|
return 0;
|
|
|
|
list->size += RESIZE_STEPS;
|
|
|
|
}
|
|
|
|
|
|
|
|
(list->list) [index].fnamelen = 2;
|
Glibing..... (2)
Wed Jan 27 03:17:44 1999 Timur Bakeyev <mc@bat.ru>
* Converted memory managment to Glib. Now we use g_new()/g_malloc()/
g_strdup()/g_free() routings. Also, copy_strings() replaced by
g_strconcat(), strcasecmp() -> g_strcasecmp(),and sprintf() by
g_snprintf().
* Some sequences of malloc()/sprintf() changed to g_strdup_printf().
* mad.[ch]: Modified, to work with new GLib's memory managment. Fixed
a missing #undef for tempnam, which caused dead loop. Add several new
functions to emulate GLib memory managment.
*main.c, mad.[ch]: Add a new switch "-M", which allows to redirect MAD
messages to the file.
* util.[ch], utilunix.c: Modified, deleted our variants of strcasecmp()
and strdup() - we have g_ equivalences. Remove get_full_name() - it is
similar to concat_dir_and_file(). Some other tricks with g_* functions.
* global.h: Modified, extended. Now it is main memory mangment include -
i.e. all inclusions of <stdlib.h>, <malloc.h>, <glib.h>, "fs.h", "mem.h",
"util.h" and "mad.h" done there. This elimanates problem with proper or-
der of #include's.
* All around the source - changed order of #include's, most of them gone
to global.h (see above), minor changes, like "0" -> NULL in string func-
tions.
1999-01-27 04:08:30 +03:00
|
|
|
(list->list) [index].fname = g_strdup ("..");
|
1998-02-27 07:54:42 +03:00
|
|
|
(list->list) [index].f.link_to_dir = 0;
|
|
|
|
(list->list) [index].f.stalled_link = 0;
|
1998-12-25 00:37:24 +03:00
|
|
|
(list->list) [index].f.dir_size_computed = 0;
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
/* FIXME: We need to get the panel definition! to use file_mark */
|
|
|
|
(list->list) [index].f.marked = 0;
|
|
|
|
mc_get_current_wd (buffer, sizeof (buffer) - 1 );
|
|
|
|
if (buffer [strlen (buffer) - 1] == PATH_SEP)
|
|
|
|
buffer [strlen (buffer) - 1] = 0;
|
|
|
|
for (;;) {
|
|
|
|
strcat (buffer, PATH_SEP_STR "..");
|
|
|
|
p = vfs_canon (buffer);
|
|
|
|
if (mc_stat (p, &((list->list) [index].buf)) != -1){
|
Glibing..... (2)
Wed Jan 27 03:17:44 1999 Timur Bakeyev <mc@bat.ru>
* Converted memory managment to Glib. Now we use g_new()/g_malloc()/
g_strdup()/g_free() routings. Also, copy_strings() replaced by
g_strconcat(), strcasecmp() -> g_strcasecmp(),and sprintf() by
g_snprintf().
* Some sequences of malloc()/sprintf() changed to g_strdup_printf().
* mad.[ch]: Modified, to work with new GLib's memory managment. Fixed
a missing #undef for tempnam, which caused dead loop. Add several new
functions to emulate GLib memory managment.
*main.c, mad.[ch]: Add a new switch "-M", which allows to redirect MAD
messages to the file.
* util.[ch], utilunix.c: Modified, deleted our variants of strcasecmp()
and strdup() - we have g_ equivalences. Remove get_full_name() - it is
similar to concat_dir_and_file(). Some other tricks with g_* functions.
* global.h: Modified, extended. Now it is main memory mangment include -
i.e. all inclusions of <stdlib.h>, <malloc.h>, <glib.h>, "fs.h", "mem.h",
"util.h" and "mad.h" done there. This elimanates problem with proper or-
der of #include's.
* All around the source - changed order of #include's, most of them gone
to global.h (see above), minor changes, like "0" -> NULL in string func-
tions.
1999-01-27 04:08:30 +03:00
|
|
|
g_free (p);
|
1998-02-27 07:54:42 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
i = 1;
|
1998-05-26 04:53:24 +04:00
|
|
|
if (!strcmp (p, PATH_SEP_STR)){
|
Glibing..... (2)
Wed Jan 27 03:17:44 1999 Timur Bakeyev <mc@bat.ru>
* Converted memory managment to Glib. Now we use g_new()/g_malloc()/
g_strdup()/g_free() routings. Also, copy_strings() replaced by
g_strconcat(), strcasecmp() -> g_strcasecmp(),and sprintf() by
g_snprintf().
* Some sequences of malloc()/sprintf() changed to g_strdup_printf().
* mad.[ch]: Modified, to work with new GLib's memory managment. Fixed
a missing #undef for tempnam, which caused dead loop. Add several new
functions to emulate GLib memory managment.
*main.c, mad.[ch]: Add a new switch "-M", which allows to redirect MAD
messages to the file.
* util.[ch], utilunix.c: Modified, deleted our variants of strcasecmp()
and strdup() - we have g_ equivalences. Remove get_full_name() - it is
similar to concat_dir_and_file(). Some other tricks with g_* functions.
* global.h: Modified, extended. Now it is main memory mangment include -
i.e. all inclusions of <stdlib.h>, <malloc.h>, <glib.h>, "fs.h", "mem.h",
"util.h" and "mad.h" done there. This elimanates problem with proper or-
der of #include's.
* All around the source - changed order of #include's, most of them gone
to global.h (see above), minor changes, like "0" -> NULL in string func-
tions.
1999-01-27 04:08:30 +03:00
|
|
|
g_free (p);
|
1998-02-27 07:54:42 +03:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
strcpy (buffer, p);
|
Glibing..... (2)
Wed Jan 27 03:17:44 1999 Timur Bakeyev <mc@bat.ru>
* Converted memory managment to Glib. Now we use g_new()/g_malloc()/
g_strdup()/g_free() routings. Also, copy_strings() replaced by
g_strconcat(), strcasecmp() -> g_strcasecmp(),and sprintf() by
g_snprintf().
* Some sequences of malloc()/sprintf() changed to g_strdup_printf().
* mad.[ch]: Modified, to work with new GLib's memory managment. Fixed
a missing #undef for tempnam, which caused dead loop. Add several new
functions to emulate GLib memory managment.
*main.c, mad.[ch]: Add a new switch "-M", which allows to redirect MAD
messages to the file.
* util.[ch], utilunix.c: Modified, deleted our variants of strcasecmp()
and strdup() - we have g_ equivalences. Remove get_full_name() - it is
similar to concat_dir_and_file(). Some other tricks with g_* functions.
* global.h: Modified, extended. Now it is main memory mangment include -
i.e. all inclusions of <stdlib.h>, <malloc.h>, <glib.h>, "fs.h", "mem.h",
"util.h" and "mad.h" done there. This elimanates problem with proper or-
der of #include's.
* All around the source - changed order of #include's, most of them gone
to global.h (see above), minor changes, like "0" -> NULL in string func-
tions.
1999-01-27 04:08:30 +03:00
|
|
|
g_free (p);
|
1998-02-27 07:54:42 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Commented out to preserve a usable '..'. What's the purpose of this
|
|
|
|
* three lines? (Norbert) */
|
|
|
|
#if 0
|
|
|
|
if (i) { /* So there is bogus information on the .. directory's stat */
|
|
|
|
(list->list) [index].buf.st_mode &= ~0444;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Used to set up a directory list when there is no access to a directory */
|
1999-02-18 03:07:26 +03:00
|
|
|
int
|
|
|
|
set_zero_dir (dir_list *list)
|
1998-02-27 07:54:42 +03:00
|
|
|
{
|
|
|
|
return (add_dotdot_to_list (list, 0));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If you change handle_dirent then check also handle_path. */
|
|
|
|
/* Return values: -1 = failure, 0 = don't add, 1 = add to the list */
|
1999-02-18 03:07:26 +03:00
|
|
|
int
|
|
|
|
handle_dirent (dir_list *list, char *filter, struct dirent *dp,
|
|
|
|
struct stat *buf1, int next_free, int *link_to_dir,
|
|
|
|
int *stalled_link)
|
1998-02-27 07:54:42 +03:00
|
|
|
{
|
|
|
|
if (dp->d_name [0] == '.' && dp->d_name [1] == 0)
|
|
|
|
return 0;
|
|
|
|
if (!show_dot_files){
|
|
|
|
if (dp->d_name [0] == '.'){
|
|
|
|
if (!(dp->d_name [1] == 0))
|
|
|
|
if (!(dp->d_name [1] == '.' && NLENGTH (dp) == 2))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!show_backups && dp->d_name [NLENGTH (dp)-1] == '~')
|
|
|
|
return 0;
|
1998-11-03 00:47:06 +03:00
|
|
|
if (mc_lstat (dp->d_name, buf1) == -1) {
|
1999-11-03 15:50:53 +03:00
|
|
|
message(1, _(" Error "), _("File '%s' exists but can not be stat-ed: %s"), dp->d_name, strerror(errno));
|
1998-02-27 07:54:42 +03:00
|
|
|
return 0;
|
1998-11-03 00:47:06 +03:00
|
|
|
}
|
1998-02-27 07:54:42 +03:00
|
|
|
|
|
|
|
if (S_ISDIR (buf1->st_mode))
|
1999-01-09 06:43:05 +03:00
|
|
|
tree_store_mark_checked (dp->d_name);
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
/* A link to a file or a directory? */
|
|
|
|
*link_to_dir = 0;
|
|
|
|
*stalled_link = 0;
|
|
|
|
if (S_ISLNK(buf1->st_mode)){
|
|
|
|
struct stat buf2;
|
|
|
|
if (!mc_stat (dp->d_name, &buf2))
|
|
|
|
*link_to_dir = S_ISDIR(buf2.st_mode) != 0;
|
|
|
|
else
|
|
|
|
*stalled_link = 1;
|
|
|
|
}
|
|
|
|
if (!(S_ISDIR(buf1->st_mode) || *link_to_dir) && filter &&
|
|
|
|
!regexp_match (filter, dp->d_name, match_file))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Need to grow the *list? */
|
|
|
|
if (next_free == list->size){
|
Glibing..... (2)
Wed Jan 27 03:17:44 1999 Timur Bakeyev <mc@bat.ru>
* Converted memory managment to Glib. Now we use g_new()/g_malloc()/
g_strdup()/g_free() routings. Also, copy_strings() replaced by
g_strconcat(), strcasecmp() -> g_strcasecmp(),and sprintf() by
g_snprintf().
* Some sequences of malloc()/sprintf() changed to g_strdup_printf().
* mad.[ch]: Modified, to work with new GLib's memory managment. Fixed
a missing #undef for tempnam, which caused dead loop. Add several new
functions to emulate GLib memory managment.
*main.c, mad.[ch]: Add a new switch "-M", which allows to redirect MAD
messages to the file.
* util.[ch], utilunix.c: Modified, deleted our variants of strcasecmp()
and strdup() - we have g_ equivalences. Remove get_full_name() - it is
similar to concat_dir_and_file(). Some other tricks with g_* functions.
* global.h: Modified, extended. Now it is main memory mangment include -
i.e. all inclusions of <stdlib.h>, <malloc.h>, <glib.h>, "fs.h", "mem.h",
"util.h" and "mad.h" done there. This elimanates problem with proper or-
der of #include's.
* All around the source - changed order of #include's, most of them gone
to global.h (see above), minor changes, like "0" -> NULL in string func-
tions.
1999-01-27 04:08:30 +03:00
|
|
|
list->list = g_realloc (list->list, sizeof (file_entry) *
|
1998-02-27 07:54:42 +03:00
|
|
|
(list->size + RESIZE_STEPS));
|
|
|
|
if (!list->list)
|
|
|
|
return -1;
|
|
|
|
list->size += RESIZE_STEPS;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
1999-08-27 09:01:08 +04:00
|
|
|
/* handle_path is a simplified handle_dirent. The difference is that
|
1998-02-27 07:54:42 +03:00
|
|
|
handle_path doesn't pay attention to show_dot_files and show_backups.
|
1999-08-27 09:01:08 +04:00
|
|
|
Moreover handle_path can't be used with a filemask.
|
1998-02-27 07:54:42 +03:00
|
|
|
If you change handle_path then check also handle_dirent. */
|
|
|
|
/* Return values: -1 = failure, 0 = don't add, 1 = add to the list */
|
1999-02-18 03:07:26 +03:00
|
|
|
int
|
|
|
|
handle_path (dir_list *list, char *path,
|
|
|
|
struct stat *buf1, int next_free, int *link_to_dir,
|
|
|
|
int *stalled_link)
|
1998-02-27 07:54:42 +03:00
|
|
|
{
|
|
|
|
if (path [0] == '.' && path [1] == 0)
|
|
|
|
return 0;
|
|
|
|
if (mc_lstat (path, buf1) == -1)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (S_ISDIR (buf1->st_mode))
|
1999-01-09 06:43:05 +03:00
|
|
|
tree_store_mark_checked (path);
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
/* A link to a file or a directory? */
|
|
|
|
*link_to_dir = 0;
|
|
|
|
*stalled_link = 0;
|
|
|
|
if (S_ISLNK(buf1->st_mode)){
|
|
|
|
struct stat buf2;
|
|
|
|
if (!mc_stat (path, &buf2))
|
|
|
|
*link_to_dir = S_ISDIR(buf2.st_mode) != 0;
|
|
|
|
else
|
|
|
|
*stalled_link = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Need to grow the *list? */
|
|
|
|
if (next_free == list->size){
|
Glibing..... (2)
Wed Jan 27 03:17:44 1999 Timur Bakeyev <mc@bat.ru>
* Converted memory managment to Glib. Now we use g_new()/g_malloc()/
g_strdup()/g_free() routings. Also, copy_strings() replaced by
g_strconcat(), strcasecmp() -> g_strcasecmp(),and sprintf() by
g_snprintf().
* Some sequences of malloc()/sprintf() changed to g_strdup_printf().
* mad.[ch]: Modified, to work with new GLib's memory managment. Fixed
a missing #undef for tempnam, which caused dead loop. Add several new
functions to emulate GLib memory managment.
*main.c, mad.[ch]: Add a new switch "-M", which allows to redirect MAD
messages to the file.
* util.[ch], utilunix.c: Modified, deleted our variants of strcasecmp()
and strdup() - we have g_ equivalences. Remove get_full_name() - it is
similar to concat_dir_and_file(). Some other tricks with g_* functions.
* global.h: Modified, extended. Now it is main memory mangment include -
i.e. all inclusions of <stdlib.h>, <malloc.h>, <glib.h>, "fs.h", "mem.h",
"util.h" and "mad.h" done there. This elimanates problem with proper or-
der of #include's.
* All around the source - changed order of #include's, most of them gone
to global.h (see above), minor changes, like "0" -> NULL in string func-
tions.
1999-01-27 04:08:30 +03:00
|
|
|
list->list = g_realloc (list->list, sizeof (file_entry) *
|
1998-02-27 07:54:42 +03:00
|
|
|
(list->size + RESIZE_STEPS));
|
|
|
|
if (!list->list)
|
|
|
|
return -1;
|
|
|
|
list->size += RESIZE_STEPS;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
1999-02-18 03:07:26 +03:00
|
|
|
int
|
|
|
|
do_load_dir (dir_list *list, sortfn *sort, int reverse, int case_sensitive, char *filter)
|
1998-02-27 07:54:42 +03:00
|
|
|
{
|
|
|
|
DIR *dirp;
|
|
|
|
struct dirent *dp;
|
|
|
|
int status, link_to_dir, stalled_link;
|
|
|
|
int next_free = 0;
|
|
|
|
struct stat buf;
|
|
|
|
int dotdot_found = 0;
|
|
|
|
|
1999-01-12 08:55:12 +03:00
|
|
|
tree_store_start_check_cwd ();
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
dirp = mc_opendir (".");
|
|
|
|
if (!dirp){
|
1999-02-13 01:23:35 +03:00
|
|
|
tree_store_end_check ();
|
1998-02-27 07:54:42 +03:00
|
|
|
return set_zero_dir (list);
|
|
|
|
}
|
|
|
|
for (dp = mc_readdir (dirp); dp; dp = mc_readdir (dirp)){
|
|
|
|
status = handle_dirent (list, filter, dp, &buf, next_free, &link_to_dir,
|
|
|
|
&stalled_link);
|
|
|
|
if (status == 0)
|
|
|
|
continue;
|
1999-02-13 01:23:35 +03:00
|
|
|
if (status == -1){
|
|
|
|
tree_store_end_check ();
|
1998-02-27 07:54:42 +03:00
|
|
|
return next_free;
|
1999-02-13 01:23:35 +03:00
|
|
|
}
|
1998-02-27 07:54:42 +03:00
|
|
|
list->list [next_free].fnamelen = NLENGTH (dp);
|
Glibing..... (2)
Wed Jan 27 03:17:44 1999 Timur Bakeyev <mc@bat.ru>
* Converted memory managment to Glib. Now we use g_new()/g_malloc()/
g_strdup()/g_free() routings. Also, copy_strings() replaced by
g_strconcat(), strcasecmp() -> g_strcasecmp(),and sprintf() by
g_snprintf().
* Some sequences of malloc()/sprintf() changed to g_strdup_printf().
* mad.[ch]: Modified, to work with new GLib's memory managment. Fixed
a missing #undef for tempnam, which caused dead loop. Add several new
functions to emulate GLib memory managment.
*main.c, mad.[ch]: Add a new switch "-M", which allows to redirect MAD
messages to the file.
* util.[ch], utilunix.c: Modified, deleted our variants of strcasecmp()
and strdup() - we have g_ equivalences. Remove get_full_name() - it is
similar to concat_dir_and_file(). Some other tricks with g_* functions.
* global.h: Modified, extended. Now it is main memory mangment include -
i.e. all inclusions of <stdlib.h>, <malloc.h>, <glib.h>, "fs.h", "mem.h",
"util.h" and "mad.h" done there. This elimanates problem with proper or-
der of #include's.
* All around the source - changed order of #include's, most of them gone
to global.h (see above), minor changes, like "0" -> NULL in string func-
tions.
1999-01-27 04:08:30 +03:00
|
|
|
list->list [next_free].fname = g_strdup (dp->d_name);
|
1998-02-27 07:54:42 +03:00
|
|
|
list->list [next_free].f.marked = 0;
|
|
|
|
list->list [next_free].f.link_to_dir = link_to_dir;
|
|
|
|
list->list [next_free].f.stalled_link = stalled_link;
|
1998-12-25 00:37:24 +03:00
|
|
|
list->list [next_free].f.dir_size_computed = 0;
|
1998-02-27 07:54:42 +03:00
|
|
|
list->list [next_free].buf = buf;
|
|
|
|
if (strcmp (dp->d_name, ".." ) == 0)
|
|
|
|
dotdot_found = 1;
|
|
|
|
next_free++;
|
|
|
|
if (!(next_free % 32))
|
|
|
|
rotate_dash ();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (next_free) {
|
|
|
|
if (!dotdot_found)
|
|
|
|
add_dotdot_to_list (list, next_free++);
|
|
|
|
do_sort (list, sort, next_free-1, reverse, case_sensitive);
|
1999-02-13 01:23:35 +03:00
|
|
|
} else {
|
|
|
|
tree_store_end_check ();
|
1998-02-27 07:54:42 +03:00
|
|
|
return set_zero_dir (list);
|
1999-02-13 01:23:35 +03:00
|
|
|
}
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
mc_closedir (dirp);
|
1999-01-09 06:43:05 +03:00
|
|
|
tree_store_end_check ();
|
1998-02-27 07:54:42 +03:00
|
|
|
return next_free;
|
|
|
|
}
|
|
|
|
|
1999-02-18 03:07:26 +03:00
|
|
|
int
|
|
|
|
link_isdir (file_entry *file)
|
1998-02-27 07:54:42 +03:00
|
|
|
{
|
1998-12-07 05:36:23 +03:00
|
|
|
if (file->f.link_to_dir)
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return 0;
|
1998-02-27 07:54:42 +03:00
|
|
|
}
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1999-02-18 03:07:26 +03:00
|
|
|
int
|
1999-08-27 09:01:08 +04:00
|
|
|
if_link_is_exe (char *full_name, file_entry *file)
|
1998-02-27 07:54:42 +03:00
|
|
|
{
|
|
|
|
struct stat b;
|
|
|
|
|
1999-02-18 03:07:26 +03:00
|
|
|
if (S_ISLNK (file->buf.st_mode)) {
|
|
|
|
mc_stat (full_name, &b);
|
1998-02-27 07:54:42 +03:00
|
|
|
return is_exe (b.st_mode);
|
1999-02-18 03:07:26 +03:00
|
|
|
} else
|
|
|
|
return 1;
|
1998-02-27 07:54:42 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static dir_list dir_copy = { 0, 0 };
|
|
|
|
|
1999-02-18 03:07:26 +03:00
|
|
|
static void
|
|
|
|
alloc_dir_copy (int size)
|
1998-02-27 07:54:42 +03:00
|
|
|
{
|
|
|
|
int i;
|
1999-08-27 09:01:08 +04:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
if (dir_copy.size < size){
|
|
|
|
if (dir_copy.list){
|
|
|
|
|
|
|
|
for (i = 0; i < dir_copy.size; i++) {
|
|
|
|
if (dir_copy.list [i].fname)
|
Glibing..... (2)
Wed Jan 27 03:17:44 1999 Timur Bakeyev <mc@bat.ru>
* Converted memory managment to Glib. Now we use g_new()/g_malloc()/
g_strdup()/g_free() routings. Also, copy_strings() replaced by
g_strconcat(), strcasecmp() -> g_strcasecmp(),and sprintf() by
g_snprintf().
* Some sequences of malloc()/sprintf() changed to g_strdup_printf().
* mad.[ch]: Modified, to work with new GLib's memory managment. Fixed
a missing #undef for tempnam, which caused dead loop. Add several new
functions to emulate GLib memory managment.
*main.c, mad.[ch]: Add a new switch "-M", which allows to redirect MAD
messages to the file.
* util.[ch], utilunix.c: Modified, deleted our variants of strcasecmp()
and strdup() - we have g_ equivalences. Remove get_full_name() - it is
similar to concat_dir_and_file(). Some other tricks with g_* functions.
* global.h: Modified, extended. Now it is main memory mangment include -
i.e. all inclusions of <stdlib.h>, <malloc.h>, <glib.h>, "fs.h", "mem.h",
"util.h" and "mad.h" done there. This elimanates problem with proper or-
der of #include's.
* All around the source - changed order of #include's, most of them gone
to global.h (see above), minor changes, like "0" -> NULL in string func-
tions.
1999-01-27 04:08:30 +03:00
|
|
|
g_free (dir_copy.list [i].fname);
|
1998-02-27 07:54:42 +03:00
|
|
|
}
|
Glibing..... (2)
Wed Jan 27 03:17:44 1999 Timur Bakeyev <mc@bat.ru>
* Converted memory managment to Glib. Now we use g_new()/g_malloc()/
g_strdup()/g_free() routings. Also, copy_strings() replaced by
g_strconcat(), strcasecmp() -> g_strcasecmp(),and sprintf() by
g_snprintf().
* Some sequences of malloc()/sprintf() changed to g_strdup_printf().
* mad.[ch]: Modified, to work with new GLib's memory managment. Fixed
a missing #undef for tempnam, which caused dead loop. Add several new
functions to emulate GLib memory managment.
*main.c, mad.[ch]: Add a new switch "-M", which allows to redirect MAD
messages to the file.
* util.[ch], utilunix.c: Modified, deleted our variants of strcasecmp()
and strdup() - we have g_ equivalences. Remove get_full_name() - it is
similar to concat_dir_and_file(). Some other tricks with g_* functions.
* global.h: Modified, extended. Now it is main memory mangment include -
i.e. all inclusions of <stdlib.h>, <malloc.h>, <glib.h>, "fs.h", "mem.h",
"util.h" and "mad.h" done there. This elimanates problem with proper or-
der of #include's.
* All around the source - changed order of #include's, most of them gone
to global.h (see above), minor changes, like "0" -> NULL in string func-
tions.
1999-01-27 04:08:30 +03:00
|
|
|
g_free (dir_copy.list);
|
1998-02-27 07:54:42 +03:00
|
|
|
dir_copy.list = 0;
|
|
|
|
}
|
|
|
|
|
Glibing..... (2)
Wed Jan 27 03:17:44 1999 Timur Bakeyev <mc@bat.ru>
* Converted memory managment to Glib. Now we use g_new()/g_malloc()/
g_strdup()/g_free() routings. Also, copy_strings() replaced by
g_strconcat(), strcasecmp() -> g_strcasecmp(),and sprintf() by
g_snprintf().
* Some sequences of malloc()/sprintf() changed to g_strdup_printf().
* mad.[ch]: Modified, to work with new GLib's memory managment. Fixed
a missing #undef for tempnam, which caused dead loop. Add several new
functions to emulate GLib memory managment.
*main.c, mad.[ch]: Add a new switch "-M", which allows to redirect MAD
messages to the file.
* util.[ch], utilunix.c: Modified, deleted our variants of strcasecmp()
and strdup() - we have g_ equivalences. Remove get_full_name() - it is
similar to concat_dir_and_file(). Some other tricks with g_* functions.
* global.h: Modified, extended. Now it is main memory mangment include -
i.e. all inclusions of <stdlib.h>, <malloc.h>, <glib.h>, "fs.h", "mem.h",
"util.h" and "mad.h" done there. This elimanates problem with proper or-
der of #include's.
* All around the source - changed order of #include's, most of them gone
to global.h (see above), minor changes, like "0" -> NULL in string func-
tions.
1999-01-27 04:08:30 +03:00
|
|
|
dir_copy.list = g_new (file_entry, size);
|
1998-12-07 05:36:23 +03:00
|
|
|
for (i = 0; i < size; i++)
|
1998-02-27 07:54:42 +03:00
|
|
|
dir_copy.list [i].fname = 0;
|
1998-12-07 05:36:23 +03:00
|
|
|
|
1998-02-27 07:54:42 +03:00
|
|
|
dir_copy.size = size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If filter is null, then it is a match */
|
1999-02-18 03:07:26 +03:00
|
|
|
int
|
2001-12-04 00:39:41 +03:00
|
|
|
do_reload_dir (dir_list * list, sortfn * sort, int count, int rev,
|
1999-02-18 03:07:26 +03:00
|
|
|
int case_sensitive, char *filter)
|
1998-02-27 07:54:42 +03:00
|
|
|
{
|
2001-12-04 00:39:41 +03:00
|
|
|
DIR *dirp;
|
1998-02-27 07:54:42 +03:00
|
|
|
struct dirent *dp;
|
2001-12-04 00:39:41 +03:00
|
|
|
int next_free = 0;
|
|
|
|
int i, status, link_to_dir, stalled_link;
|
|
|
|
struct stat buf;
|
|
|
|
int dotdot_found = 0;
|
|
|
|
int marked_cnt;
|
2001-12-11 03:30:12 +03:00
|
|
|
GHashTable *marked_files = g_hash_table_new (g_str_hash, g_str_equal);
|
1998-02-27 07:54:42 +03:00
|
|
|
|
1999-01-12 08:55:12 +03:00
|
|
|
tree_store_start_check_cwd ();
|
1998-02-27 07:54:42 +03:00
|
|
|
dirp = mc_opendir (".");
|
|
|
|
if (!dirp) {
|
2001-12-04 00:39:41 +03:00
|
|
|
clean_dir (list, count);
|
1999-02-11 00:58:05 +03:00
|
|
|
tree_store_end_check ();
|
1998-02-27 07:54:42 +03:00
|
|
|
return set_zero_dir (list);
|
|
|
|
}
|
|
|
|
|
|
|
|
alloc_dir_copy (list->size);
|
2001-12-04 00:39:41 +03:00
|
|
|
for (marked_cnt = i = 0; i < count; i++) {
|
|
|
|
dir_copy.list[i].fnamelen = list->list[i].fnamelen;
|
|
|
|
dir_copy.list[i].fname = list->list[i].fname;
|
|
|
|
dir_copy.list[i].f.marked = list->list[i].f.marked;
|
|
|
|
dir_copy.list[i].f.dir_size_computed =
|
|
|
|
list->list[i].f.dir_size_computed;
|
|
|
|
dir_copy.list[i].f.link_to_dir = list->list[i].f.link_to_dir;
|
|
|
|
dir_copy.list[i].f.stalled_link = list->list[i].f.stalled_link;
|
2001-12-11 03:30:12 +03:00
|
|
|
if (list->list[i].f.marked) {
|
|
|
|
g_hash_table_insert (marked_files, dir_copy.list[i].fname,
|
|
|
|
&dir_copy.list[i]);
|
2001-12-04 00:39:41 +03:00
|
|
|
marked_cnt++;
|
2001-12-11 03:30:12 +03:00
|
|
|
}
|
1998-02-27 07:54:42 +03:00
|
|
|
}
|
|
|
|
|
2001-12-04 00:39:41 +03:00
|
|
|
for (dp = mc_readdir (dirp); dp; dp = mc_readdir (dirp)) {
|
|
|
|
status =
|
|
|
|
handle_dirent (list, filter, dp, &buf, next_free, &link_to_dir,
|
|
|
|
&stalled_link);
|
1998-02-27 07:54:42 +03:00
|
|
|
if (status == 0)
|
|
|
|
continue;
|
|
|
|
if (status == -1) {
|
|
|
|
mc_closedir (dirp);
|
1999-08-27 09:01:08 +04:00
|
|
|
/* Norbert (Feb 12, 1997):
|
2001-12-04 00:39:41 +03:00
|
|
|
Just in case someone finds this memory leak:
|
|
|
|
-1 means big trouble (at the moment no memory left),
|
|
|
|
I don't bother with further cleanup because if one gets to
|
|
|
|
this point he will have more problems than a few memory
|
|
|
|
leaks and because one 'clean_dir' would not be enough (and
|
|
|
|
because I don't want to spent the time to make it working,
|
|
|
|
IMHO it's not worthwhile).
|
|
|
|
clean_dir (&dir_copy, count);
|
|
|
|
*/
|
1999-02-11 00:58:05 +03:00
|
|
|
tree_store_end_check ();
|
1998-02-27 07:54:42 +03:00
|
|
|
return next_free;
|
|
|
|
}
|
1999-08-27 09:01:08 +04:00
|
|
|
|
2001-12-04 00:39:41 +03:00
|
|
|
list->list[next_free].f.marked = 0;
|
1999-08-27 09:01:08 +04:00
|
|
|
|
2001-12-04 00:39:41 +03:00
|
|
|
/*
|
|
|
|
* If we have marked files in the copy, scan through the copy
|
|
|
|
* to find matching file. Decrease number of remaining marks if
|
|
|
|
* we copied one.
|
|
|
|
*/
|
|
|
|
if (marked_cnt > 0) {
|
2001-12-11 03:30:12 +03:00
|
|
|
file_entry *p;
|
|
|
|
if (NULL !=
|
|
|
|
(p = g_hash_table_lookup (marked_files, dp->d_name))) {
|
|
|
|
list->list[next_free].f.marked = 1;
|
|
|
|
marked_cnt--;
|
2001-12-04 00:39:41 +03:00
|
|
|
}
|
|
|
|
}
|
1999-08-27 09:01:08 +04:00
|
|
|
|
2001-12-11 03:30:12 +03:00
|
|
|
list->list[next_free].fnamelen = NLENGTH (dp);
|
2001-12-04 00:39:41 +03:00
|
|
|
list->list[next_free].fname = g_strdup (dp->d_name);
|
|
|
|
list->list[next_free].f.link_to_dir = link_to_dir;
|
|
|
|
list->list[next_free].f.stalled_link = stalled_link;
|
|
|
|
list->list[next_free].f.dir_size_computed = 0;
|
|
|
|
list->list[next_free].buf = buf;
|
|
|
|
if (strcmp (dp->d_name, "..") == 0)
|
1998-02-27 07:54:42 +03:00
|
|
|
dotdot_found = 1;
|
|
|
|
next_free++;
|
|
|
|
if (!(next_free % 16))
|
|
|
|
rotate_dash ();
|
|
|
|
}
|
|
|
|
mc_closedir (dirp);
|
1999-01-09 06:43:05 +03:00
|
|
|
tree_store_end_check ();
|
2001-12-11 03:30:12 +03:00
|
|
|
g_hash_table_destroy (marked_files);
|
1998-02-27 07:54:42 +03:00
|
|
|
if (next_free) {
|
|
|
|
if (!dotdot_found)
|
|
|
|
add_dotdot_to_list (list, next_free++);
|
2001-12-04 00:39:41 +03:00
|
|
|
do_sort (list, sort, next_free - 1, rev, case_sensitive);
|
|
|
|
} else
|
1998-02-27 07:54:42 +03:00
|
|
|
next_free = set_zero_dir (list);
|
|
|
|
clean_dir (&dir_copy, count);
|
|
|
|
return next_free;
|
|
|
|
}
|
|
|
|
|