aboutsummaryrefslogtreecommitdiff
path: root/coreutils/ls.c
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils/ls.c')
-rw-r--r--coreutils/ls.c62
1 files changed, 31 insertions, 31 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 5042c1298..46ab865dd 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -173,7 +173,7 @@ static int show_color = 0;
173static const struct option ls_color_opt[] = 173static const struct option ls_color_opt[] =
174{ 174{
175 {"color", optional_argument, NULL, 1}, 175 {"color", optional_argument, NULL, 1},
176 {NULL, 0, NULL, 0} 176 {NULL, 0, NULL, 0}
177}; 177};
178 178
179#define COLOR(mode) ("\000\043\043\043\042\000\043\043"\ 179#define COLOR(mode) ("\000\043\043\043\042\000\043\043"\
@@ -318,7 +318,7 @@ static int count_dirs(struct dnode **dn, int nfiles, int notsubdirs)
318 dirs = 0; 318 dirs = 0;
319 for (i = 0; i < nfiles; i++) { 319 for (i = 0; i < nfiles; i++) {
320 if (S_ISDIR(dn[i]->dstat.st_mode) 320 if (S_ISDIR(dn[i]->dstat.st_mode)
321 && (notsubdirs || 321 && (notsubdirs ||
322 ((dn[i]->name[0] != '.') || (dn[i]->name[1] 322 ((dn[i]->name[0] != '.') || (dn[i]->name[1]
323 && ((dn[i]->name[1] != '.') 323 && ((dn[i]->name[1] != '.')
324 || dn[i]->name[2]))))) 324 || dn[i]->name[2])))))
@@ -747,7 +747,7 @@ static int list_single(struct dnode *dn)
747 { 747 {
748 char context[80]; 748 char context[80];
749 int len; 749 int len;
750 750
751 if (dn->sid) { 751 if (dn->sid) {
752 /* I assume sid initilized with NULL */ 752 /* I assume sid initilized with NULL */
753 len = strlen(dn->sid)+1; 753 len = strlen(dn->sid)+1;
@@ -895,57 +895,57 @@ static const char ls_options[]="Cadil1gnsxAk" \
895 895
896static const unsigned opt_flags[] = { 896static const unsigned opt_flags[] = {
897 LIST_SHORT | STYLE_COLUMNS, /* C */ 897 LIST_SHORT | STYLE_COLUMNS, /* C */
898 DISP_HIDDEN | DISP_DOT, /* a */ 898 DISP_HIDDEN | DISP_DOT, /* a */
899 DISP_NOLIST, /* d */ 899 DISP_NOLIST, /* d */
900 LIST_INO, /* i */ 900 LIST_INO, /* i */
901 LIST_LONG | STYLE_LONG, /* l - remember LS_DISP_HR in mask! */ 901 LIST_LONG | STYLE_LONG, /* l - remember LS_DISP_HR in mask! */
902 LIST_SHORT | STYLE_SINGLE, /* 1 */ 902 LIST_SHORT | STYLE_SINGLE, /* 1 */
903 0, /* g - ingored */ 903 0, /* g - ingored */
904 LIST_ID_NUMERIC, /* n */ 904 LIST_ID_NUMERIC, /* n */
905 LIST_BLOCKS, /* s */ 905 LIST_BLOCKS, /* s */
906 DISP_ROWS, /* x */ 906 DISP_ROWS, /* x */
907 DISP_HIDDEN, /* A */ 907 DISP_HIDDEN, /* A */
908#ifdef CONFIG_SELINUX 908#ifdef CONFIG_SELINUX
909 LIST_CONTEXT, /* k */ 909 LIST_CONTEXT, /* k */
910#else 910#else
911 0, /* k - ingored */ 911 0, /* k - ingored */
912#endif 912#endif
913#ifdef CONFIG_FEATURE_LS_TIMESTAMPS 913#ifdef CONFIG_FEATURE_LS_TIMESTAMPS
914# ifdef CONFIG_FEATURE_LS_SORTFILES 914# ifdef CONFIG_FEATURE_LS_SORTFILES
915 TIME_CHANGE | SORT_CTIME, /* c */ 915 TIME_CHANGE | SORT_CTIME, /* c */
916# else 916# else
917 TIME_CHANGE, /* c */ 917 TIME_CHANGE, /* c */
918# endif 918# endif
919 LIST_FULLTIME, /* e */ 919 LIST_FULLTIME, /* e */
920# ifdef CONFIG_FEATURE_LS_SORTFILES 920# ifdef CONFIG_FEATURE_LS_SORTFILES
921 SORT_MTIME, /* t */ 921 SORT_MTIME, /* t */
922# else 922# else
923 0, /* t - ignored -- is this correct? */ 923 0, /* t - ignored -- is this correct? */
924# endif 924# endif
925# ifdef CONFIG_FEATURE_LS_SORTFILES 925# ifdef CONFIG_FEATURE_LS_SORTFILES
926 TIME_ACCESS | SORT_ATIME, /* u */ 926 TIME_ACCESS | SORT_ATIME, /* u */
927# else 927# else
928 TIME_ACCESS, /* u */ 928 TIME_ACCESS, /* u */
929# endif 929# endif
930#endif 930#endif
931#ifdef CONFIG_FEATURE_LS_SORTFILES 931#ifdef CONFIG_FEATURE_LS_SORTFILES
932 SORT_SIZE, /* S */ 932 SORT_SIZE, /* S */
933 SORT_EXT, /* X */ 933 SORT_EXT, /* X */
934 SORT_ORDER_REVERSE, /* r */ 934 SORT_ORDER_REVERSE, /* r */
935 SORT_VERSION, /* v */ 935 SORT_VERSION, /* v */
936#endif 936#endif
937#ifdef CONFIG_FEATURE_LS_FILETYPES 937#ifdef CONFIG_FEATURE_LS_FILETYPES
938 LIST_FILETYPE | LIST_EXEC, /* F */ 938 LIST_FILETYPE | LIST_EXEC, /* F */
939 LIST_FILETYPE, /* p */ 939 LIST_FILETYPE, /* p */
940#endif 940#endif
941#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS 941#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS
942 FOLLOW_LINKS, /* L */ 942 FOLLOW_LINKS, /* L */
943#endif 943#endif
944#ifdef CONFIG_FEATURE_LS_RECURSIVE 944#ifdef CONFIG_FEATURE_LS_RECURSIVE
945 DISP_RECURSIVE, /* R */ 945 DISP_RECURSIVE, /* R */
946#endif 946#endif
947#ifdef CONFIG_FEATURE_HUMAN_READABLE 947#ifdef CONFIG_FEATURE_HUMAN_READABLE
948 LS_DISP_HR, /* h */ 948 LS_DISP_HR, /* h */
949#endif 949#endif
950#ifdef CONFIG_SELINUX 950#ifdef CONFIG_SELINUX
951 LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */ 951 LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */
@@ -1025,7 +1025,7 @@ extern int ls_main(int argc, char **argv)
1025 for (i = 0; opt_flags[i] != (1U<<31); i++) { 1025 for (i = 0; opt_flags[i] != (1U<<31); i++) {
1026 if (opt & (1 << i)) { 1026 if (opt & (1 << i)) {
1027 unsigned int flags = opt_flags[i]; 1027 unsigned int flags = opt_flags[i];
1028 1028
1029 if (flags & LIST_MASK_TRIGGER) { 1029 if (flags & LIST_MASK_TRIGGER) {
1030 all_fmt &= ~LIST_MASK; 1030 all_fmt &= ~LIST_MASK;
1031 } 1031 }
@@ -1064,11 +1064,11 @@ extern int ls_main(int argc, char **argv)
1064#if CONFIG_FEATURE_LS_COLOR_IS_DEFAULT 1064#if CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
1065 char *p; 1065 char *p;
1066 1066
1067 if ((p = getenv ("LS_COLORS")) != NULL && 1067 if ((p = getenv ("LS_COLORS")) != NULL &&
1068 (*p == '\0' || (strcmp(p, "none") == 0))) { 1068 (*p == '\0' || (strcmp(p, "none") == 0))) {
1069 ; 1069 ;
1070 } else if (isatty(STDOUT_FILENO)) { 1070 } else if (isatty(STDOUT_FILENO)) {
1071 show_color = 1; 1071 show_color = 1;
1072 } 1072 }
1073#endif 1073#endif
1074 1074