Check bogus and ignore against the relative name, not the absolute.
This commit is contained in:
parent
9c0f44a5b3
commit
e534982b63
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=19816
@ -372,36 +372,38 @@ void
|
||||
GetNext(int *i, int *n, struct dirent **nl, const char *dir, const char *name, u_long *ignored, u_long *bogus, u_long *wrong)
|
||||
{
|
||||
char buf[BUFSIZ];
|
||||
char buf1[BUFSIZ];
|
||||
|
||||
for (;;) {
|
||||
for (;;) {
|
||||
(*i)++;
|
||||
if (*i >= *n)
|
||||
return;
|
||||
*buf = 0;
|
||||
if (*dir != '/')
|
||||
strcat(buf, "/");
|
||||
strcat(buf, dir);
|
||||
if (buf[strlen(buf)-1] != '/')
|
||||
strcat(buf, "/");
|
||||
strcat(buf, name);
|
||||
if (buf[strlen(buf)-1] != '/')
|
||||
strcat(buf, "/");
|
||||
strcat(buf, nl[*i]->d_name);
|
||||
strcpy(buf1, name);
|
||||
if (buf1[strlen(buf1)-1] != '/')
|
||||
strcat(buf1, "/");
|
||||
strcat(buf1, nl[*i]->d_name);
|
||||
if (flag_ignore &&
|
||||
!regexec(®_ignore, buf, 0, 0, 0)) {
|
||||
!regexec(®_ignore, buf1, 0, 0, 0)) {
|
||||
(*ignored)++;
|
||||
fprintf(logf, "Ignore %s\n", buf);
|
||||
fprintf(logf, "Ignore %s\n", buf1);
|
||||
if (verbose > 2) {
|
||||
fprintf(stderr, "Ignore %s\n", buf);
|
||||
fprintf(stderr, "Ignore %s\n", buf1);
|
||||
}
|
||||
} else if (flag_bogus &&
|
||||
!regexec(®_bogus, buf, 0, 0, 0)) {
|
||||
!regexec(®_bogus, buf1, 0, 0, 0)) {
|
||||
(*bogus)++;
|
||||
fprintf(logf, "Bogus %s\n", buf);
|
||||
fprintf(stderr, "Bogus %s\n", buf);
|
||||
fprintf(logf, "Bogus %s\n", buf1);
|
||||
fprintf(stderr, "Bogus %s\n", buf1);
|
||||
damage++;
|
||||
} else {
|
||||
*buf = 0;
|
||||
if (*dir != '/')
|
||||
strcat(buf, "/");
|
||||
strcat(buf, dir);
|
||||
if (buf[strlen(buf)-1] != '/')
|
||||
strcat(buf, "/");
|
||||
strcat(buf, buf1);
|
||||
break;
|
||||
}
|
||||
free(nl[*i]); nl[*i] = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user