From d8e8eb2eef04443d3489d79cf5bf02d8ee2373c2 Mon Sep 17 00:00:00 2001 From: Orestis Floros Date: Fri, 1 May 2020 12:15:30 +0200 Subject: Move general functions scalloc, sstrdup out of i3status.c --- src/print_file_contents.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/print_file_contents.c') diff --git a/src/print_file_contents.c b/src/print_file_contents.c index 65813f5..37701f1 100644 --- a/src/print_file_contents.c +++ b/src/print_file_contents.c @@ -14,14 +14,6 @@ #define STRING_SIZE 10 -static void *scalloc(size_t size) { - void *result = calloc(size, 1); - if (result == NULL) { - die("Error: out of memory (calloc(%zu))\n", size); - } - return result; -} - void print_file_contents(yajl_gen json_gen, char *buffer, const char *title, const char *path, const char *format, const char *format_bad, const int max_chars) { const char *walk = format; char *outwalk = buffer; -- cgit v1.2.3 From 94d10968c94ad1a13392db1e17ed26265336fd33 Mon Sep 17 00:00:00 2001 From: Orestis Floros Date: Fri, 1 May 2020 12:16:59 +0200 Subject: print_file_contents: Resolve tilde Fixes #350 --- src/general.c | 1 - src/print_file_contents.c | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/print_file_contents.c') diff --git a/src/general.c b/src/general.c index c089126..6036b69 100644 --- a/src/general.c +++ b/src/general.c @@ -18,7 +18,6 @@ die(__VA_ARGS__); \ } - /* * Reads size bytes into the destination buffer from filename. * diff --git a/src/print_file_contents.c b/src/print_file_contents.c index 37701f1..b66321a 100644 --- a/src/print_file_contents.c +++ b/src/print_file_contents.c @@ -19,11 +19,13 @@ void print_file_contents(yajl_gen json_gen, char *buffer, const char *title, con char *outwalk = buffer; char *buf = scalloc(max_chars * sizeof(char) + 1); - int n = -1; - int fd = open(path, O_RDONLY); + char *abs_path = resolve_tilde(path); + int fd = open(abs_path, O_RDONLY); + free(abs_path); INSTANCE(path); + int n = -1; if (fd > -1) { n = read(fd, buf, max_chars); if (n != -1) { -- cgit v1.2.3