summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2016-02-18 19:57:28 +0100
committerDaniel Friesel <derf@finalrewind.org>2016-02-18 20:48:46 +0100
commit1d1c999a51db52739483f7137104b7e8bedb83fa (patch)
treed2fedf5b8d790c3d9a25cf4d47c9a9d1df6f9f78 /src
parent85da0324a1ebb13374224f4c92441f068ca01f9c (diff)
filelist: Don't try to fopen() stdin (it's a stream, not a file)
Diffstat (limited to 'src')
-rw-r--r--src/filelist.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/filelist.c b/src/filelist.c
index eaef54b..9391ba0 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -545,7 +545,13 @@ gib_list *feh_read_filelist(char *filename)
opt.magick_timeout = tmp_magick_timeout;
errno = 0;
- if ((fp = fopen(filename, "r")) == NULL) {
+
+ if (!strcmp(filename, "/dev/stdin"))
+ fp = stdin;
+ else
+ fp = fopen(filename, "r");
+
+ if (fp == NULL) {
/* return quietly, as it's okay to specify a filelist file that doesn't
exist. In that case we create it on exit. */
return(NULL);