From e4e4c186877a9e859da44bed446220adae015ed9 Mon Sep 17 00:00:00 2001 From: Quentin Rameau Date: Sun, 19 Apr 2015 00:58:48 +0200 Subject: [PATCH 4/4] ls: fix missing mention of some options --- README | 2 +- ls.1 | 20 ++++++++++---------- ls.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README b/README index cdc2aaa..e605546 100644 --- a/README +++ b/README @@ -45,7 +45,7 @@ The following tools are implemented: =*|o ln . =*|o logger . =*|o logname . -#* o ls (-C, -k, -m, -p, -s, -x) +#* o ls (-C, -k, -m, -s, -x) =*|x md5sum . =*|o mkdir . =*|o mkfifo . diff --git a/ls.1 b/ls.1 index ea4e9b4..58e7382 100644 --- a/ls.1 +++ b/ls.1 @@ -22,10 +22,12 @@ lists each given file, and the contents of each given directory. If no files are given the current directory is listed. .Sh OPTIONS .Bl -tag -width Ds +.It Fl 1 +Output one entry per line. This is the default. .It Fl A List all entries except for '.' and '..'. .It Fl a -Show hidden files (those beginning with '.'). +List all entries including '.' and '..'. .It Fl c Use time file's status was last changed instead of last modification time for sorting or printing. @@ -36,9 +38,9 @@ Append a file type indicator to all special files. .It Fl f Like .Fl U -but turns on +but turn on .Fl a -and disables +and disable .Fl r , .Fl S and @@ -61,9 +63,9 @@ themselves. List detailed information about each file, including their type, permissions, links, owner, group, size, and last file status/modification time. .It Fl n -List detailed information about each file, including their type, permissions, -links, owner, group, size, and last file status/modification time, but with -numeric IDs. +Turn on +.Fl l +but display numeric IDs. .It Fl o Turn on .Fl l @@ -73,9 +75,7 @@ Append a file type indicator to directories. .It Fl q Replace non-printable characters in filenames with '?'. .It Fl R -List directory content recursively. The -.Fl 1 -flag is set implicitly. +List directory content recursively. .It Fl r Reverse the sort order. .It Fl S @@ -96,7 +96,7 @@ The utility is compliant with the .St -p1003.1-2013 specification except from the -.Op Fl Ckmpsx +.Op Fl Ckmsx flags. .Pp The diff --git a/ls.c b/ls.c index ae9f593..2b89e57 100644 --- a/ls.c +++ b/ls.c @@ -349,7 +349,7 @@ ls(char *path, struct entry *ent, int listdir) static void usage(void) { - eprintf("usage: %s [-1AacdFfgHhiLlopqRrStUu] [file ...]\n", argv0); + eprintf("usage: %s [-1AacdFfgHhiLlnopqRrStUu] [file ...]\n", argv0); } int -- 2.3.5