diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2011-04-26 17:02:24 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2011-04-26 17:02:24 +0200 |
| commit | b4c95797ed5f88deacbda18d9364fdbeaf2bc100 (patch) | |
| tree | 8c022f760658740a1199a08cf08572ab72e1a119 /src/imlib.c | |
| parent | 569c27a1c68cdac24cc603a8a033f90747010c98 (diff) | |
Only create caption directory when writing out a caption (closes #42)
Diffstat (limited to 'src/imlib.c')
| -rw-r--r-- | src/imlib.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/imlib.c b/src/imlib.c index d125286..dcf3c5c 100644 --- a/src/imlib.c +++ b/src/imlib.c @@ -505,7 +505,7 @@ void feh_draw_info(winwidget w) return; } -char *build_caption_filename(feh_file * file) +char *build_caption_filename(feh_file * file, short create_dir) { char *caption_filename; char *s, *dir, *caption_dir; @@ -524,6 +524,8 @@ char *build_caption_filename(feh_file * file) D(("dir %s, cp %s, cdir %s\n", dir, opt.caption_path, caption_dir)) if (stat(caption_dir, &cdir_stat) == -1) { + if (!create_dir) + return NULL; if (mkdir(caption_dir, 0755) == -1) eprintf("Failed to create caption directory %s:", caption_dir); } else if (!S_ISDIR(cdir_stat.st_mode)) @@ -559,9 +561,12 @@ void feh_draw_caption(winwidget w) if (!file->caption) { char *caption_filename; - caption_filename = build_caption_filename(file); - /* read caption from file */ - file->caption = ereadfile(caption_filename); + caption_filename = build_caption_filename(file, 0); + if (caption_filename) + /* read caption from file */ + file->caption = ereadfile(caption_filename); + else + file->caption = estrdup(""); free(caption_filename); } |