mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 02:12:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

Utilities: Remove memset calls inside ls

Browse source
This commit is contained in:
Jean-Baptiste Boric 2021-08-18 19:23:59 +02:00 • committed by Andreas Kling
parent 58cebf1b6f
commit 5a8de62a1a
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Userland/Utilities/ls.cpp
View file

@ -35,7 +35,8 @@
struct FileMetadata { struct FileMetadata {
String name; String name;
String path; String path;
struct stat stat; struct stat stat {
};
}; };
static int do_file_system_object_long(const char* path); static int do_file_system_object_long(const char* path);
@ -148,10 +149,9 @@ int main(int argc, char** argv)
metadata.name = path; metadata.name = path;
int rc = lstat(path.characters(), &metadata.stat); int rc = lstat(path.characters(), &metadata.stat);
if (rc < 0) { if (rc < 0)
perror("lstat"); perror("lstat");
memset(&metadata.stat, 0, sizeof(metadata.stat));
}
files.append(metadata); files.append(metadata);
} }
quick_sort(files, filemetadata_comparator); quick_sort(files, filemetadata_comparator);
@ -372,12 +372,11 @@ static bool print_filesystem_object(const String& path, const String& name, cons
static int do_file_system_object_long(const char* path) static int do_file_system_object_long(const char* path)
{ {
if (flag_list_directories_only) { if (flag_list_directories_only) {
struct stat stat; struct stat stat {
};
int rc = lstat(path, &stat); int rc = lstat(path, &stat);
if (rc < 0) { if (rc < 0)
perror("lstat"); perror("lstat");
memset(&stat, 0, sizeof(stat));
}
if (print_filesystem_object(path, path, stat)) if (print_filesystem_object(path, path, stat))
return 0; return 0;
return 2; return 2;
@ -393,12 +392,11 @@ static int do_file_system_object_long(const char* path)
if (di.has_error()) { if (di.has_error()) {
if (di.error() == ENOTDIR) { if (di.error() == ENOTDIR) {
struct stat stat; struct stat stat {
};
int rc = lstat(path, &stat); int rc = lstat(path, &stat);
if (rc < 0) { if (rc < 0)
perror("lstat"); perror("lstat");
memset(&stat, 0, sizeof(stat));
}
if (print_filesystem_object(path, path, stat)) if (print_filesystem_object(path, path, stat))
return 0; return 0;
return 2; return 2;
@ -423,10 +421,9 @@ static int do_file_system_object_long(const char* path)
metadata.path = builder.to_string(); metadata.path = builder.to_string();
VERIFY(!metadata.path.is_null()); VERIFY(!metadata.path.is_null());
int rc = lstat(metadata.path.characters(), &metadata.stat); int rc = lstat(metadata.path.characters(), &metadata.stat);
if (rc < 0) { if (rc < 0)
perror("lstat"); perror("lstat");
memset(&metadata.stat, 0, sizeof(metadata.stat));
}
files.append(move(metadata)); files.append(move(metadata));
} }
@ -536,10 +533,8 @@ int do_file_system_object_short(const char* path)
metadata.path = builder.to_string(); metadata.path = builder.to_string();
VERIFY(!metadata.path.is_null()); VERIFY(!metadata.path.is_null());
int rc = lstat(metadata.path.characters(), &metadata.stat); int rc = lstat(metadata.path.characters(), &metadata.stat);
if (rc < 0) { if (rc < 0)
perror("lstat"); perror("lstat");
memset(&metadata.stat, 0, sizeof(metadata.stat));
}
files.append(metadata); files.append(metadata);
if (metadata.name.length() > longest_name) if (metadata.name.length() > longest_name)