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

When matching installed packages against glob keep track of which patterns

Browse Source 
actually triggered a match and which did not, and add patterns that didn't
into resulting list, so caller will have a chance to notify user that package
isn't installed. This should fix current, POLA-breaking behaviour when user
doesn't receive a notification if he specifies several packages, some of which
aren't installed.
This commit is contained in:
Maxim Sobolev 2001-03-14 19:46:43 +00:00
parent 57d4db4bc5
commit 6f8e863b0f
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
usr.sbin/pkg_install/lib/match.c
View File

@ -58,12 +58,13 @@ static int fname_cmp(const FTSENT **, const FTSENT **);
char **
matchinstalled(match_t MatchType, char **patterns, int *retval)
{
int i, errcode;
int i, errcode, len;
char *tmp, *matched;
char *paths[2];
static struct store *store = NULL;
FTS *ftsp;
FTSENT *f;
Boolean *lmatched;
if (store == NULL) {
store = malloc(sizeof *store);
@ -95,6 +96,18 @@ matchinstalled(match_t MatchType, char **patterns, int *retval)
/* Not reached */
}
/* Count number of patterns */
for (len = 0; patterns[len]; len++) {}
lmatched = alloca(sizeof(*lmatched) * len);
if (lmatched == NULL) {
warnx("%s(): alloca() failed", __FUNCTION__);
if (retval != NULL)
*retval = 1;
return NULL;
}
for (i = 0; i < len; i++)
lmatched[i] = FALSE;
paths[0] = tmp;
paths[1] = NULL;
ftsp = fts_open(paths, FTS_LOGICAL | FTS_NOCHDIR | FTS_NOSTAT, fname_cmp);
@ -117,8 +130,10 @@ matchinstalled(match_t MatchType, char **patterns, int *retval)
}
break;
case MATCH_GLOB:
if (fnmatch(patterns[i], f->fts_name, 0) == 0)
if (fnmatch(patterns[i], f->fts_name, 0) == 0) {
matched = f->fts_name;
lmatched[i] = TRUE;
}
break;
default:
break;
@ -139,6 +154,12 @@ matchinstalled(match_t MatchType, char **patterns, int *retval)
fts_close(ftsp);
}
if (MatchType == MATCH_GLOB) {
for (i = 0; i < len; i++)
if (lmatched[i] == FALSE)
storeappend(store, patterns[i]);
}
if (store->used == 0)
return NULL;
else