LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-07 11:39:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ls: Add single file support in short mode

Browse Source
This commit is contained in:
faissaloo 2019-05-26 18:52:51 +01:00 committed by Andreas Kling
parent b311257098
commit 07c356ce64
Notes: sideshowbarker 2024-07-19 13:55:10 +09:00 
Author: https://github.com/faissaloo
Commit: https://github.com/SerenityOS/serenity/commit/07c356ce645
Pull-request: https://github.com/SerenityOS/serenity/pull/120
Reviewed-by: https://github.com/awesomekling
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Userland/ls.cpp
View File

@ -185,6 +185,19 @@ int do_dir(const char* path)
return 0;
}
int print_filesystem_object_short(const char *path, const char *name, int *nprinted) {
struct stat st;
int rc = lstat(path, &st);
if (rc == -1) {
printf("lstat(%s) failed: %s\n", path, strerror(errno));
return 2;
}
*nprinted = print_name(st, name);
return 0;
}
int do_dir_short(const char* path)
{
int rows;
@ -193,8 +206,15 @@ int do_dir_short(const char* path)
DIR* dirp = opendir(path);
if (!dirp) {
perror("opendir");
return 1;
if (errno == ENOTDIR) {
int nprinted;
print_filesystem_object_short(path, path, &nprinted);
printf("\n");
return 0;
} else {
perror("opendir");
return 1;
}
}
Vector<String, 1024> names;
@ -209,19 +229,16 @@ int do_dir_short(const char* path)
closedir(dirp);
int printed_on_row = 0;
int nprinted;
for (int i = 0; i < names.size(); ++i) {
auto& name = names[i];
struct stat st;
char pathbuf[256];
sprintf(pathbuf, "%s/%s", path, name.characters());
int rc = lstat(pathbuf, &st);
if (rc == -1) {
printf("lstat(%s) failed: %s\n", pathbuf, strerror(errno));
return 2;
}
int nprinted = print_name(st, name.characters());
if (print_filesystem_object_short(pathbuf, name.characters(), &nprinted) == 2) {
return 2;
}
int column_width = 14;
printed_on_row += column_width;