RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 17:57:35 +00:00
Code Issues Activity Actions

Userland: ls: Add -o and -B / --ignore-backups flags

Browse source 
* `-B`, --ignore-backups`: Do not list implied entries ending with ~
* `-o`, In long format, do not show group information
This commit is contained in:
Brendan Coles 2020-11-10 13:05:45 +00:00 • committed by Andreas Kling
parent 5fae567008
commit 7e0204fb41
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Base/usr/share/man/man1/ls.md
View file

@ -19,12 +19,14 @@ If no *path* argument is provided the current working directory is used.
* `--help`: Display this message * `--help`: Display this message
* `-a`, `--all`: Show dotfiles * `-a`, `--all`: Show dotfiles
* `-A`: Do not list implied . and .. directories * `-A`: Do not list implied . and .. directories
* `-B`, --ignore-backups`: Do not list implied entries ending with ~
* `-l`, `--long`: Display long info * `-l`, `--long`: Display long info
* `-t`: Sort files by timestamp * `-t`: Sort files by timestamp
* `-r`, `--reverse`: Reverse sort order * `-r`, `--reverse`: Reverse sort order
* `-G`: Use pretty colors * `-G`: Use pretty colors
* `-i`, `--inode`: Show inode ids * `-i`, `--inode`: Show inode ids
* `-n`, `--numeric-uid-gid`: In long format, display numeric UID/GID * `-n`, `--numeric-uid-gid`: In long format, display numeric UID/GID
* `-o`, In long format, do not show group information
* `-h`, `--human-readable`: Print human-readable sizes * `-h`, `--human-readable`: Print human-readable sizes
* `-K`, `--no-hyperlinks`: Disable hyperlinks * `-K`, `--no-hyperlinks`: Disable hyperlinks

23
Userland/ls.cpp
View file

@ -55,8 +55,10 @@ static bool flag_colorize = false;
static bool flag_long = false; static bool flag_long = false;
static bool flag_show_dotfiles = false; static bool flag_show_dotfiles = false;
static bool flag_show_almost_all_dotfiles = false; static bool flag_show_almost_all_dotfiles = false;
static bool flag_ignore_backups = false;
static bool flag_show_inode = false; static bool flag_show_inode = false;
static bool flag_print_numeric = false; static bool flag_print_numeric = false;
static bool flag_hide_group = false;
static bool flag_human_readable = false; static bool flag_human_readable = false;
static bool flag_sort_by_timestamp = false; static bool flag_sort_by_timestamp = false;
static bool flag_reverse_sort = false; static bool flag_reverse_sort = false;
@ -99,12 +101,14 @@ int main(int argc, char** argv)
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.add_option(flag_show_dotfiles, "Show dotfiles", "all", 'a'); args_parser.add_option(flag_show_dotfiles, "Show dotfiles", "all", 'a');
args_parser.add_option(flag_show_almost_all_dotfiles, "Do not list implied . and .. directories", nullptr, 'A'); args_parser.add_option(flag_show_almost_all_dotfiles, "Do not list implied . and .. directories", nullptr, 'A');
args_parser.add_option(flag_ignore_backups, "Do not list implied entries ending with ~", "--ignore-backups", 'B');
args_parser.add_option(flag_long, "Display long info", "long", 'l'); args_parser.add_option(flag_long, "Display long info", "long", 'l');
args_parser.add_option(flag_sort_by_timestamp, "Sort files by timestamp", nullptr, 't'); args_parser.add_option(flag_sort_by_timestamp, "Sort files by timestamp", nullptr, 't');
args_parser.add_option(flag_reverse_sort, "Reverse sort order", "reverse", 'r'); args_parser.add_option(flag_reverse_sort, "Reverse sort order", "reverse", 'r');
args_parser.add_option(flag_colorize, "Use pretty colors", nullptr, 'G'); args_parser.add_option(flag_colorize, "Use pretty colors", nullptr, 'G');
args_parser.add_option(flag_show_inode, "Show inode ids", "inode", 'i'); args_parser.add_option(flag_show_inode, "Show inode ids", "inode", 'i');
args_parser.add_option(flag_print_numeric, "In long format, display numeric UID/GID", "numeric-uid-gid", 'n'); args_parser.add_option(flag_print_numeric, "In long format, display numeric UID/GID", "numeric-uid-gid", 'n');
args_parser.add_option(flag_hide_group, "In long format, do not show group information", nullptr, 'o');
args_parser.add_option(flag_human_readable, "Print human-readable sizes", "human-readable", 'h'); args_parser.add_option(flag_human_readable, "Print human-readable sizes", "human-readable", 'h');
args_parser.add_option(flag_disable_hyperlinks, "Disable hyperlinks", "no-hyperlinks", 'K'); args_parser.add_option(flag_disable_hyperlinks, "Disable hyperlinks", "no-hyperlinks", 'K');
args_parser.add_positional_argument(paths, "Directory to list", "path", Core::ArgsParser::Required::No); args_parser.add_positional_argument(paths, "Directory to list", "path", Core::ArgsParser::Required::No);
@ -277,16 +281,19 @@ static bool print_filesystem_object(const String& path, const String& name, cons
printf("%c", st.st_mode & S_IXOTH ? 'x' : '-'); printf("%c", st.st_mode & S_IXOTH ? 'x' : '-');
auto username = users.get(st.st_uid); auto username = users.get(st.st_uid);
auto groupname = groups.get(st.st_gid);
if (!flag_print_numeric && username.has_value()) { if (!flag_print_numeric && username.has_value()) {
printf(" %7s", username.value().characters()); printf(" %7s", username.value().characters());
} else { } else {
printf(" %7u", st.st_uid); printf(" %7u", st.st_uid);
} }
if (!flag_print_numeric && groupname.has_value()) {
printf(" %7s", groupname.value().characters()); if (!flag_hide_group) {
} else { auto groupname = groups.get(st.st_gid);
printf(" %7u", st.st_gid); if (!flag_print_numeric && groupname.has_value()) {
printf(" %7s", groupname.value().characters());
} else {
printf(" %7u", st.st_gid);
}
} }
if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) { if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) {
@ -350,6 +357,9 @@ static int do_file_system_object_long(const char* path)
} }
} }
if (metadata.name.ends_with('~') && flag_ignore_backups && metadata.name != path)
continue;
StringBuilder builder; StringBuilder builder;
builder.append(path); builder.append(path);
builder.append('/'); builder.append('/');
@ -432,6 +442,9 @@ int do_file_system_object_short(const char* path)
} }
} }
if (name.ends_with('~') && flag_ignore_backups && name != path)
continue;
names.append(name); names.append(name);
if (names.last().length() > longest_name) if (names.last().length() > longest_name)
longest_name = name.length(); longest_name = name.length();