From 66c3c55759a7ee23af75657215a2fd0e1aa39558 Mon Sep 17 00:00:00 2001 From: Bert Münnich Date: Wed, 28 Oct 2015 21:50:17 +0100 Subject: Use POSIX.1-2008 getline(3) --- main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 3ab7b2c..a03f5a4 100644 --- a/main.c +++ b/main.c @@ -825,8 +825,9 @@ int main(int argc, char **argv) fileidx = 0; if (options->from_stdin) { + n = 0; filename = NULL; - while ((len = get_line(&filename, &n, stdin)) > 0) { + while ((len = getline(&filename, &n, stdin)) > 0) { if (filename[len-1] == '\n') filename[len-1] = '\0'; check_add_file(filename, true); @@ -883,9 +884,9 @@ int main(int argc, char **argv) const char *name[] = { "image-info", "key-handler" }; for (i = 0; i < ARRLEN(cmd); i++) { - len = strlen(homedir) + strlen(dsuffix) + strlen(name[i]) + 12; - *cmd[i] = (char*) s_malloc(len); - snprintf(*cmd[i], len, "%s%s/sxiv/exec/%s", homedir, dsuffix, name[i]); + n = strlen(homedir) + strlen(dsuffix) + strlen(name[i]) + 12; + *cmd[i] = (char*) s_malloc(n); + snprintf(*cmd[i], n, "%s%s/sxiv/exec/%s", homedir, dsuffix, name[i]); if (access(*cmd[i], X_OK) != 0) { free(*cmd[i]); *cmd[i] = NULL; -- cgit v1.2.3-54-g00ecf