Archives/mblaze
2
0
Fork 0
mirror of https://github.com/leahneukirchen/mblaze synced 2024-11-03 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity

seq: fix message number reporting when using iterdir

Browse Source
This commit is contained in:
Christian Neukirchen 2016-08-04 20:20:15 +02:00
parent d6815bf78f
commit 77d0498b6c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
seq.c
View File

@ -315,17 +315,19 @@ blaze822_seq_next(char *map, char *range, struct blaze822_seq_iter *iter)
return r;
}
static void
static long
iterdir(char *dir, void (*cb)(char *))
{
DIR *fd, *fd2;
struct dirent *d;
long i = 0;
fd = opendir(dir);
if (!fd) {
if (errno == ENOTDIR)
cb(dir);
return;
return 1;
}
char sub[PATH_MAX];
@ -348,8 +350,11 @@ iterdir(char *dir, void (*cb)(char *))
else
snprintf(sub, sizeof sub, "%s/%s", dir, d->d_name);
cb(sub);
i++;
}
closedir(fd);
return i;
}
int
@ -376,8 +381,7 @@ blaze822_loop(int argc, char *argv[], void (*cb)(char *))
int j = 0;
for (i = 0; i < argc; i++) {
if (strchr(argv[i], '/')) { // a file name
iterdir(argv[i], cb);
j++;
j += iterdir(argv[i], cb);
} else {
while ((line = blaze822_seq_next(map, argv[i], &iter))) {
cb(line);