DeforaOS/utils
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed "ls -ld"

Browse Source
This commit is contained in:
Pierre Pronchery 2005-08-07 02:34:32 +00:00
parent 6d8f6f4b92
commit 6616bc4b1d
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ls.c
View File

@ -201,10 +201,13 @@ static int _ls(int argc, char * argv[], Prefs * prefs)
int isdir; int isdir;
char * str; char * str;
if(argc == 0) if(argc == 0 && !(*prefs & PREFS_d))
return _ls_directory_do(prefs, "."); return _ls_directory_do(prefs, ".");
if(_ls_args(&files, &dirs) != 0) if(_ls_args(&files, &dirs) != 0)
return 2; return 2;
if(argc == 0)
res += slist_insert_sorted(files, strdup("."),
(compare_func)strcmp);
for(i = 0; i < argc; i++) for(i = 0; i < argc; i++)
{ {
if((isdir = _is_directory(prefs, argv[i])) == 2) if((isdir = _is_directory(prefs, argv[i])) == 2)
@ -579,16 +582,17 @@ static int _ls_do_dirs(Prefs * prefs, int argc, SList * dirs)
static int _usage(void) static int _usage(void)
{ {
fprintf(stderr, "%s", "Usage: ls [-CFRacdilqrtu1][-H | -L]\n\ fprintf(stderr, "%s", "Usage: ls [-CFRacdilqrtu1][-H | -L]\n\
-C write multi-column output\n\ -C write multi-column output\n\
-F write a symbol after files names depending on their type\n\ -F write a symbol after files names depending on their type\n\
-R recursively list subdirectories encountered\n\ -R recursively list subdirectories encountered\n\
-a write out all hidden directory entries\n\ -a write out all hidden directory entries\n\
-c use time of last modification of file status\n\ -c use time of last modification of file status\n\
-l write out in long format\n\ -d treat directories like files\n\
-u use time of last access\n\ -l write out in long format\n\
-1 force output to be one entry per line\n\ -u use time of last access\n\
-H dereference symbolic links\n\ -1 force output to be one entry per line\n\
-L evaluate symbolic links\n"); -H dereference symbolic links\n\
-L evaluate symbolic links\n");
return 1; return 1;
} }