d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check bogus and ignore against the relative name, not the absolute.

Browse Source
This commit is contained in:
phk 1996-11-16 22:05:46 +00:00
parent ef4965625d
commit 136a6776dd
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
usr.sbin/ctm/mkCTM/mkctm.c
View File

@ -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) 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 buf[BUFSIZ];
char buf1[BUFSIZ];
for (;;) { for (;;) {
for (;;) { for (;;) {
(*i)++; (*i)++;
if (*i >= *n) if (*i >= *n)
return; return;
*buf = 0; strcpy(buf1, name);
if (*dir != '/') if (buf1[strlen(buf1)-1] != '/')
strcat(buf, "/"); strcat(buf1, "/");
strcat(buf, dir); strcat(buf1, nl[*i]->d_name);
if (buf[strlen(buf)-1] != '/')
strcat(buf, "/");
strcat(buf, name);
if (buf[strlen(buf)-1] != '/')
strcat(buf, "/");
strcat(buf, nl[*i]->d_name);
if (flag_ignore && if (flag_ignore &&
!regexec(&reg_ignore, buf, 0, 0, 0)) { !regexec(&reg_ignore, buf1, 0, 0, 0)) {
(*ignored)++; (*ignored)++;
fprintf(logf, "Ignore %s\n", buf); fprintf(logf, "Ignore %s\n", buf1);
if (verbose > 2) { if (verbose > 2) {
fprintf(stderr, "Ignore %s\n", buf); fprintf(stderr, "Ignore %s\n", buf1);
} }
} else if (flag_bogus && } else if (flag_bogus &&
!regexec(&reg_bogus, buf, 0, 0, 0)) { !regexec(&reg_bogus, buf1, 0, 0, 0)) {
(*bogus)++; (*bogus)++;
fprintf(logf, "Bogus %s\n", buf); fprintf(logf, "Bogus %s\n", buf1);
fprintf(stderr, "Bogus %s\n", buf); fprintf(stderr, "Bogus %s\n", buf1);
damage++; damage++;
} else { } else {
*buf = 0;
if (*dir != '/')
strcat(buf, "/");
strcat(buf, dir);
if (buf[strlen(buf)-1] != '/')
strcat(buf, "/");
strcat(buf, buf1);
break; break;
} }
free(nl[*i]); nl[*i] = 0; free(nl[*i]); nl[*i] = 0;