mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

More use link_isdir().

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2016-08-16 14:20:49 +03:00
parent 6127e5aea6
commit f408e9a755
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/filemanager/dir.c
View File

@ -55,9 +55,9 @@
/*** file scope macro definitions ****************************************************************/ /*** file scope macro definitions ****************************************************************/
#define MY_ISDIR(x) (\ #define MY_ISDIR(x) (\
(is_exe (x->st.st_mode) && !(S_ISDIR (x->st.st_mode) || x->f.link_to_dir) && exec_first) \ (is_exe (x->st.st_mode) && !(S_ISDIR (x->st.st_mode) || link_isdir (x)) && exec_first) \
? 1 \ ? 1 \
: ( (S_ISDIR (x->st.st_mode) || x->f.link_to_dir) ? 2 : 0) ) : ( (S_ISDIR (x->st.st_mode) || link_isdir (x)) ? 2 : 0) )
/*** file scope type declarations ****************************************************************/ /*** file scope type declarations ****************************************************************/

8
src/filemanager/panel.c
View File

@ -526,10 +526,10 @@ string_file_size (file_entry_t * fe, int len)
static const char * static const char *
string_file_size_brief (file_entry_t * fe, int len) string_file_size_brief (file_entry_t * fe, int len)
{ {
if (S_ISLNK (fe->st.st_mode) && !fe->f.link_to_dir) if (S_ISLNK (fe->st.st_mode) && !link_isdir (fe))
return _("SYMLINK"); return _("SYMLINK");
if ((S_ISDIR (fe->st.st_mode) || fe->f.link_to_dir) && !DIR_IS_DOTDOT (fe->fname)) if ((S_ISDIR (fe->st.st_mode) || link_isdir (fe)) && !DIR_IS_DOTDOT (fe->fname))
return _("SUB-DIR"); return _("SUB-DIR");
return string_file_size (fe, len); return string_file_size (fe, len);
@ -549,7 +549,7 @@ string_file_type (file_entry_t * fe, int len)
buffer[0] = PATH_SEP; buffer[0] = PATH_SEP;
else if (S_ISLNK (fe->st.st_mode)) else if (S_ISLNK (fe->st.st_mode))
{ {
if (fe->f.link_to_dir) if (link_isdir (fe))
buffer[0] = '~'; buffer[0] = '~';
else if (fe->f.stale_link) else if (fe->f.stale_link)
buffer[0] = '!'; buffer[0] = '!';
@ -2877,7 +2877,7 @@ chdir_other_panel (WPanel * panel)
if (get_other_type () != view_listing) if (get_other_type () != view_listing)
set_display_type (get_other_index (), view_listing); set_display_type (get_other_index (), view_listing);
if (S_ISDIR (entry->st.st_mode) || entry->f.link_to_dir) if (S_ISDIR (entry->st.st_mode) || link_isdir (entry))
new_dir_vpath = vfs_path_append_new (panel->cwd_vpath, entry->fname, (char *) NULL); new_dir_vpath = vfs_path_append_new (panel->cwd_vpath, entry->fname, (char *) NULL);
else else
{ {