Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve the last change.

Browse Source 
Handling all kinds of wildcards properly would be hard, though it should
handle some cases better now. Esp. ones with '-' in the pkg(!) name, and/or
ones with dewer relational versions. I.e. the teTeX-share>1.97 case should
work now.
This commit is contained in:
hubertf 2000-04-01 22:12:45 +00:00
parent 68fdf492b5
commit f996345ebf
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.sbin/pkg_install/add/perform.c
View File

@ -1,11 +1,11 @@
/* $NetBSD: perform.c,v 1.48 2000/04/01 14:54:51 augustss Exp $ */
/* $NetBSD: perform.c,v 1.49 2000/04/01 22:12:45 hubertf Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
#else
__RCSID("$NetBSD: perform.c,v 1.48 2000/04/01 14:54:51 augustss Exp $");
__RCSID("$NetBSD: perform.c,v 1.49 2000/04/01 22:12:45 hubertf Exp $");
#endif
#endif
@ -363,12 +363,24 @@ pkg_do(char *pkg)
* and we better stop right now.
*/
char *s;
char *fmt = NULL;
int skip = -1;
/* doing this right required to parse the full version(s),
* do a 99% solution here for now */
if ((s = strpbrk(p->name, "<>")) != NULL) {
fmt = "%.*s-[0-9]*";
skip = 0;
} else if ((s = strrchr(p->name, '-')) != NULL) {
fmt = "%.*s[0-9]*";
skip = 1;
}
if ((s = strrchr(p->name, '-')) != NULL || (s = strpbrk(p->name, "<>[]?*{")) != NULL) {
if (fmt != NULL) {
char buf[FILENAME_MAX];
(void) snprintf(buf, sizeof(buf), "%.*s[0-9]*",
(int)(s - p->name) + 1, p->name);
(void) snprintf(buf, sizeof(buf), fmt,
(int)(s - p->name) + skip, p->name);
if (findmatchingname(dbdir, buf, note_whats_installed, installed) > 0) {
warnx("pkg `%s' required, but `%s' found installed.\n"
"Please resolve this conflict!", p->name, installed);