mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dir-iterator: add flags parameter to dir_iterator_begin

Browse Source 
Add the possibility of giving flags to dir_iterator_begin to initialize
a dir-iterator with special options.

Currently possible flags are:
- DIR_ITERATOR_PEDANTIC, which makes dir_iterator_advance abort
immediately in the case of an error, instead of keep looking for the
next valid entry;
- DIR_ITERATOR_FOLLOW_SYMLINKS, which makes the iterator follow
symlinks and include linked directories' contents in the iteration.

These new flags will be used in a subsequent patch.

Also add tests for the flags' usage and adjust refs/files-backend.c to
the new dir_iterator_begin signature.

Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matheus Tavares
2019-07-10 20:59:00 -03:00
committed by Junio C Hamano
parent 3012397e03
commit fa1da7d2ee
5 changed files with 190 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
t/helper/test-dir-iterator.c
View File

@ -4,29 +4,44 @@
#include "iterator.h"
#include "dir-iterator.h"
/* Argument is a directory path to iterate over */
/*
* usage:
* tool-test dir-iterator [--follow-symlinks] [--pedantic] directory_path
*/
int cmd__dir_iterator(int argc, const char **argv)
{
struct strbuf path = STRBUF_INIT;
struct dir_iterator *diter;
unsigned int flags = 0;
int iter_status;
if (argc < 2)
die("BUG: test-dir-iterator needs one argument");
for (++argv, --argc; *argv && starts_with(*argv, "--"); ++argv, --argc) {
if (strcmp(*argv, "--follow-symlinks") == 0)
flags |= DIR_ITERATOR_FOLLOW_SYMLINKS;
else if (strcmp(*argv, "--pedantic") == 0)
flags |= DIR_ITERATOR_PEDANTIC;
else
die("invalid option '%s'", *argv);
}
strbuf_add(&path, argv[1], strlen(argv[1]));
if (!*argv || argc != 1)
die("dir-iterator needs exactly one non-option argument");
diter = dir_iterator_begin(path.buf);
strbuf_add(&path, *argv, strlen(*argv));
diter = dir_iterator_begin(path.buf, flags);
if (!diter) {
printf("dir_iterator_begin failure: %d\n", errno);
exit(EXIT_FAILURE);
}
while (dir_iterator_advance(diter) == ITER_OK) {
while ((iter_status = dir_iterator_advance(diter)) == ITER_OK) {
if (S_ISDIR(diter->st.st_mode))
printf("[d] ");
else if (S_ISREG(diter->st.st_mode))
printf("[f] ");
else if (S_ISLNK(diter->st.st_mode))
printf("[s] ");
else
printf("[?] ");
@ -34,5 +49,10 @@ int cmd__dir_iterator(int argc, const char **argv)
diter->path.buf);
}
if (iter_status != ITER_DONE) {
printf("dir_iterator_advance failure\n");
return 1;
}
return 0;
}