1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
From 4c99b47411932c2e46ca282597418329a7fbeea9 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 23 Apr 2019 14:42:38 +0300
Subject: [PATCH] Always read all files in the directory sxiv gets
---
main.c | 43 ++++++++++++++++++++++++++++++-------------
1 file changed, 30 insertions(+), 13 deletions(-)
diff --git a/main.c b/main.c
index 8adbf78..f5eeea1 100644
--- a/main.c
+++ b/main.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <stdlib.h>
+#include <libgen.h>
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
@@ -817,15 +818,36 @@ void setup_signal(int sig, void (*handler)(int sig))
error(EXIT_FAILURE, errno, "signal %d", sig);
}
+int add_files_from_dir(char *directory, char *exclude_filename, bool recursive)
+{
+ r_dir_t dir;
+ if (r_opendir(&dir, directory, recursive) < 0) {
+ error(0, errno, "%s", directory);
+ return 1;
+ }
+ int start = fileidx;
+ char *filename;
+ while ((filename = r_readdir(&dir, true)) != NULL) {
+
+ if (strcmp(filename, exclude_filename) != 0) {
+ check_add_file(filename, false);
+ }
+ free((void*) filename);
+ }
+ r_closedir(&dir);
+ if (fileidx - start > 1)
+ qsort(files + start, fileidx - start, sizeof(fileinfo_t), fncmp);
+ return 0;
+}
+
int main(int argc, char **argv)
{
- int i, start;
+ int i;
size_t n;
ssize_t len;
char *filename;
const char *homedir, *dsuffix = "";
struct stat fstats;
- r_dir_t dir;
setup_signal(SIGCHLD, sigchld);
setup_signal(SIGPIPE, SIG_IGN);
@@ -874,19 +896,14 @@ int main(int argc, char **argv)
}
if (!S_ISDIR(fstats.st_mode)) {
check_add_file(filename, true);
+ char *_filename = strdup(filename);
+ char *filedir = strdup(filename);
+ filedir = dirname(filename);
+ if (!add_files_from_dir(filedir, _filename, options->recursive))
+ continue;
} else {
- if (r_opendir(&dir, filename, options->recursive) < 0) {
- error(0, errno, "%s", filename);
+ if (!add_files_from_dir(filename, "", options->recursive))
continue;
- }
- start = fileidx;
- while ((filename = r_readdir(&dir, true)) != NULL) {
- check_add_file(filename, false);
- free((void*) filename);
- }
- r_closedir(&dir);
- if (fileidx - start > 1)
- qsort(files + start, fileidx - start, sizeof(fileinfo_t), fncmp);
}
}
--
2.24.1
|