marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

print_file_contents: Resolve tilde

Browse Source 
Fixes #350
This commit is contained in:
Orestis Floros 2020-05-01 12:16:59 +02:00
parent d8e8eb2eef
commit 94d10968c9
No known key found for this signature in database
GPG Key ID: A09DBD7D3222C1C3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/general.c
View File

@ -18,7 +18,6 @@
die(__VA_ARGS__); \ die(__VA_ARGS__); \
} }
/* /*
* Reads size bytes into the destination buffer from filename. * Reads size bytes into the destination buffer from filename.
* *

6
src/print_file_contents.c
View File

@ -19,11 +19,13 @@ void print_file_contents(yajl_gen json_gen, char *buffer, const char *title, con
char *outwalk = buffer; char *outwalk = buffer;
char *buf = scalloc(max_chars * sizeof(char) + 1); char *buf = scalloc(max_chars * sizeof(char) + 1);
int n = -1; char *abs_path = resolve_tilde(path);
int fd = open(path, O_RDONLY); int fd = open(abs_path, O_RDONLY);
free(abs_path);
INSTANCE(path); INSTANCE(path);
int n = -1;
if (fd > -1) { if (fd > -1) {
n = read(fd, buf, max_chars); n = read(fd, buf, max_chars);
if (n != -1) { if (n != -1) {