aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-28 13:02:55 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-28 13:02:55 +0000
commit656f746e7443a431240adcd042457b8441248848 (patch)
tree0b6b72324152d94354122e1d98de90b30e363cb6
parent8c0c119130be3da88fe880ff47a1bfa2c51d0083 (diff)
downloadbusybox-w32-656f746e7443a431240adcd042457b8441248848.tar.gz
busybox-w32-656f746e7443a431240adcd042457b8441248848.tar.bz2
busybox-w32-656f746e7443a431240adcd042457b8441248848.zip
ls: silly comment fixes
-rw-r--r--coreutils/ls.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 6b507db69..8a83d7543 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -64,7 +64,7 @@ LIST_MASK = (LIST_EXEC << 1) - 1,
64 64
65/* what files will be displayed */ 65/* what files will be displayed */
66DISP_DIRNAME = 1 << 15, /* 2 or more items? label directories */ 66DISP_DIRNAME = 1 << 15, /* 2 or more items? label directories */
67DISP_HIDDEN = 1 << 16, /* show filenames starting with . */ 67DISP_HIDDEN = 1 << 16, /* show filenames starting with . */
68DISP_DOT = 1 << 17, /* show . and .. */ 68DISP_DOT = 1 << 17, /* show . and .. */
69DISP_NOLIST = 1 << 18, /* show directory as itself, not contents */ 69DISP_NOLIST = 1 << 18, /* show directory as itself, not contents */
70DISP_RECURSIVE = 1 << 19, /* show directory and everything below it */ 70DISP_RECURSIVE = 1 << 19, /* show directory and everything below it */
@@ -116,7 +116,7 @@ SPLIT_SUBDIR = 2,
116#if ENABLE_FEATURE_LS_COLOR 116#if ENABLE_FEATURE_LS_COLOR
117static int show_color; 117static int show_color;
118/* long option entry used only for --color, which has no short option 118/* long option entry used only for --color, which has no short option
119 * equivalent. */ 119 * equivalent */
120static const struct option ls_color_opt[] = { 120static const struct option ls_color_opt[] = {
121 { "color", optional_argument, NULL, 1 }, 121 { "color", optional_argument, NULL, 1 },
122 { NULL, 0, NULL, 0 } 122 { NULL, 0, NULL, 0 }
@@ -523,7 +523,7 @@ static struct dnode **list_dir(const char *path)
523 closedir(dir); 523 closedir(dir);
524 524
525 /* now that we know how many files there are 525 /* now that we know how many files there are
526 ** allocate memory for an array to hold dnode pointers 526 * allocate memory for an array to hold dnode pointers
527 */ 527 */
528 if (dn == NULL) 528 if (dn == NULL)
529 return NULL; 529 return NULL;
@@ -634,8 +634,8 @@ static int list_single(struct dnode *dn)
634 int len = 0; 634 int len = 0;
635 635
636 if (dn->sid) { 636 if (dn->sid) {
637 /* I assume sid initilized with NULL */ 637 /* I assume sid initilized with NULL */
638 len = strlen(dn->sid)+1; 638 len = strlen(dn->sid) + 1;
639 safe_strncpy(context, dn->sid, len); 639 safe_strncpy(context, dn->sid, len);
640 freecon(dn->sid); 640 freecon(dn->sid);
641 } else { 641 } else {
@@ -760,7 +760,7 @@ static const unsigned opt_flags[] = {
760 LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */ 760 LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */
761#endif 761#endif
762#if ENABLE_FEATURE_AUTOWIDTH 762#if ENABLE_FEATURE_AUTOWIDTH
763 0, 0, /* T, w - ignored */ 763 0, 0, /* T, w - ignored */
764#endif 764#endif
765 (1U<<31) 765 (1U<<31)
766}; 766};
@@ -789,7 +789,7 @@ int ls_main(int argc, char **argv)
789 (ENABLE_FEATURE_LS_SORTFILES * (SORT_NAME | SORT_FORWARD)); 789 (ENABLE_FEATURE_LS_SORTFILES * (SORT_NAME | SORT_FORWARD));
790 790
791#if ENABLE_FEATURE_AUTOWIDTH 791#if ENABLE_FEATURE_AUTOWIDTH
792 /* Obtain the terminal width. */ 792 /* Obtain the terminal width */
793 get_terminal_width_height(STDOUT_FILENO, &terminal_width, NULL); 793 get_terminal_width_height(STDOUT_FILENO, &terminal_width, NULL);
794 /* Go one less... */ 794 /* Go one less... */
795 terminal_width--; 795 terminal_width--;
@@ -900,8 +900,8 @@ int ls_main(int argc, char **argv)
900 } 900 }
901 901
902 /* now that we know how many files there are 902 /* now that we know how many files there are
903 ** allocate memory for an array to hold dnode pointers 903 * allocate memory for an array to hold dnode pointers
904 */ 904 */
905 dnp = dnalloc(nfiles); 905 dnp = dnalloc(nfiles);
906 for (i = 0, cur = dn; i < nfiles; i++) { 906 for (i = 0, cur = dn; i < nfiles; i++) {
907 dnp[i] = cur; /* save pointer to node in array */ 907 dnp[i] = cur; /* save pointer to node in array */