mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

* screen.c (string_file_type): Check for "regularity" before

Browse Source 
checking for executable bit.
(file_compute_color): Likewise.
This commit is contained in:
Pavel Roskin 2003-01-21 00:40:45 +00:00
parent 54a2e8283d
commit 51f61ccbd0
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,5 +1,9 @@
2003-01-20 Pavel Roskin <proski@gnu.org>
* screen.c (string_file_type): Check for "regularity" before
checking for executable bit.
(file_compute_color): Likewise.
* dir.c (handle_dirent): Fix cleaning the stat buffer if
mc_lstat() fails. Leave buf1->st_mode to be 0, so that the
entry is marked as a "non-regular file of unknown kind".

18
src/screen.c
View File

@ -256,12 +256,12 @@ string_file_type (file_entry *fe, int len)
buffer[0] = '+';
else if (S_ISFIFO (fe->buf.st_mode))
buffer[0] = '|';
else if (!S_ISREG (fe->buf.st_mode))
buffer[0] = '?'; /* non-regular of unknown kind */
else if (is_exe (fe->buf.st_mode))
buffer[0] = '*';
else if (S_ISREG (fe->buf.st_mode))
buffer[0] = ' ';
else
buffer[0] = '?'; /* non-regular of unknown kind */
buffer[0] = ' ';
buffer[1] = '\0';
return buffer;
}
@ -498,17 +498,15 @@ file_compute_color (int attr, file_entry *fe)
return (SPECIAL_COLOR);
else if (S_ISDOOR (fe->buf.st_mode))
return (SPECIAL_COLOR);
else if (!S_ISREG (fe->buf.st_mode))
return (STALE_LINK_COLOR); /* non-regular file of unknown kind */
else if (is_exe (fe->buf.st_mode))
return (EXECUTABLE_COLOR);
else if (fe->fname
&& (!strcmp (fe->fname, "core")
|| !strcmp (extension (fe->fname), "core")))
else if (fe->fname && (!strcmp (fe->fname, "core")
|| !strcmp (extension (fe->fname), "core")))
return (CORE_COLOR);
else if (S_ISREG (fe->buf.st_mode))
return (NORMAL_COLOR);
/* non-regular file of unknown kind */
return (STALE_LINK_COLOR);
return (NORMAL_COLOR);
}
/* Formats the file number file_index of panel in the buffer dest */