beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Userland/ls: escape non-printable characters

Browse source 
Fixes #1044
This commit is contained in:
joshua stein 2020-01-15 16:01:38 -06:00 committed by Andreas Kling
parent 24b8a27190
commit d7e8431cdb
Notes: sideshowbarker 2024-07-19 10:02:15 +09:00 
Author: https://github.com/jcs
Commit: https://github.com/SerenityOS/serenity/commit/d7e8431cdbf
Pull-request: https://github.com/SerenityOS/serenity/pull/1082
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Userland/ls.cpp
View file

@ -4,6 +4,7 @@
#include <AK/StringBuilder.h>
#include <AK/Vector.h>
#include <LibCore/CDirIterator.h>
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
@ -121,11 +122,28 @@ int main(int argc, char** argv)
return status;
}
int print_escaped(const char* name)
{
int printed = 0;
for (int i = 0; name[i] != '\0'; i++) {
if (isprint(name[i])) {
putchar(name[i]);
printed++;
} else {
printed += printf("\\%03d", name[i]);
}
}
return printed;
}
int print_name(const struct stat& st, const String& name, const char* path_for_link_resolution = nullptr)
{
int nprinted = name.length();
int nprinted = 0;
if (!flag_colorize || !output_is_terminal) {
printf("%s", name.characters());
nprinted = printf("%s", name.characters());
} else {
const char* begin_color = "";
const char* end_color = "\033[0m";
@ -144,7 +162,9 @@ int print_name(const struct stat& st, const String& name, const char* path_for_l
begin_color = "\033[35;1m";
else if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))
begin_color = "\033[33;1m";
printf("%s%s%s", begin_color, name.characters(), end_color);
printf("%s", begin_color);
nprinted = print_escaped(name.characters());
printf("%s", end_color);
}
if (S_ISLNK(st.st_mode)) {
if (path_for_link_resolution) {
@ -153,7 +173,7 @@ int print_name(const struct stat& st, const String& name, const char* path_for_l
if (nread < 0)
perror("readlink failed");
else
nprinted += printf(" -> %s", linkbuf);
nprinted += printf(" -> ") + print_escaped(linkbuf);
} else {
nprinted += printf("@");
}