Fix stupid bug (wrong variable)
-Erik
This commit is contained in:
parent
f29f797f54
commit
c366050a23
10
utility.c
10
utility.c
@ -610,6 +610,7 @@ int recursiveAction(const char *fileName,
|
|||||||
fprintf(stderr, name_too_long, "ftw");
|
fprintf(stderr, name_too_long, "ftw");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
memset(nextFile, 0, sizeof(nextFile));
|
||||||
sprintf(nextFile, "%s/%s", fileName, next->d_name);
|
sprintf(nextFile, "%s/%s", fileName, next->d_name);
|
||||||
status =
|
status =
|
||||||
recursiveAction(nextFile, TRUE, followLinks, depthFirst,
|
recursiveAction(nextFile, TRUE, followLinks, depthFirst,
|
||||||
@ -1083,12 +1084,15 @@ extern int check_wildcard_match(const char *text, const char *pattern)
|
|||||||
if (*text == ch)
|
if (*text == ch)
|
||||||
found = TRUE;
|
found = TRUE;
|
||||||
}
|
}
|
||||||
|
if (found == FALSE)
|
||||||
//if (!found)
|
continue;
|
||||||
if (found == TRUE) {
|
if (found == TRUE) {
|
||||||
|
//printf("Got a match. pattern='%s' text='%s'\n", pattern, text);
|
||||||
|
if (retryPat || retryText) {
|
||||||
pattern = retryPat;
|
pattern = retryPat;
|
||||||
text = ++retryText;
|
text = ++retryText;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* fall into next case */
|
/* fall into next case */
|
||||||
|
|
||||||
@ -1378,7 +1382,7 @@ extern pid_t* findPidByName( char* pidName)
|
|||||||
}
|
}
|
||||||
p=buffer+6; /* Skip the "Name:\t" */
|
p=buffer+6; /* Skip the "Name:\t" */
|
||||||
|
|
||||||
if (((q=strstr(q, pidName)) != NULL)
|
if (((q=strstr(p, pidName)) != NULL)
|
||||||
&& (strncmp(q, pidName, strlen(pidName)) != 0)) {
|
&& (strncmp(q, pidName, strlen(pidName)) != 0)) {
|
||||||
pidList=realloc( pidList, sizeof(pid_t) * (i+2));
|
pidList=realloc( pidList, sizeof(pid_t) * (i+2));
|
||||||
if (pidList==NULL)
|
if (pidList==NULL)
|
||||||
|
Loading…
Reference in New Issue
Block a user