summaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorBert Münnich <ber.t@posteo.de>2015-10-28 21:50:17 +0100
committerBert Münnich <ber.t@posteo.de>2015-10-28 21:50:17 +0100
commit66c3c55759a7ee23af75657215a2fd0e1aa39558 (patch)
tree8b2c471d2ee9af05ae6c8f01174183970d323d04 /main.c
parente574a6d0dd209cba5e61f23c992a8d6d9bd1fc90 (diff)
downloadnsxiv-66c3c55759a7ee23af75657215a2fd0e1aa39558.tar.zst
Use POSIX.1-2008 getline(3)
Diffstat (limited to 'main.c')
-rw-r--r--main.c9
1 files changed, 5 insertions, 4 deletions
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;