X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=lib%2Ffindpkg.c;h=072f9f1cbd21745259eeb1c0b59e412424bd490a;hb=903da5cc8edf74516b98027fb67a25eb407c2f4d;hp=900b6cbc74ebd51bfb5ce0184d95715793e72c60;hpb=0187a28d81a65b5b92c6c2dbaacce07d6277ba33;p=zpackage diff --git a/lib/findpkg.c b/lib/findpkg.c index 900b6cb..072f9f1 100644 --- a/lib/findpkg.c +++ b/lib/findpkg.c @@ -11,66 +11,6 @@ #define DMARK fprintf(stderr, "mark %s %s:%d\n", __FILE__, __func__, __LINE__) -int zpm_parse_package(char *pstr, char *name, char *ver, int *rel) { - if (name) *name = 0; - if (ver) *ver = 0; - if (rel) *rel = 0; - int havename = 0; - int havever = 0; - int haverel = 0; - - /* string - ver - rel */ - /* rel is all digits */ - /* possible forms: - * ^(.+)-([0-9][^-]*)-([\d+])$ - * ^(.+)-([0-9][^-]*)$ - * ^(.+)$ - * The main problem in parsing is that the package name itself - * can contain a '-', so you can't just split on '-' - * Also, the version can be just digits. - */ - - /* everything up to the first '-' is in the name */ - while (*pstr) { - if (*pstr == '\'' || !isgraph(*pstr)) { - return 0; - } - if (*pstr == '-' && isdigit(*(pstr+1))) { - break; - } - if (name) { - *name++ = *pstr; - } - pstr++; - havename = 1; - } - if (name) *name = 0; - if (*pstr == '-') { - pstr++; - } - while (*pstr && *pstr != '-') { - if (*pstr == '\'' || !isgraph(*pstr)) { - return 0; - } - if (ver) { - *ver++ = *pstr; - } - pstr++; - havever = 1; - } - if (ver) *ver = 0; - if (*pstr == '-') { - pstr++; - } - /* TODO use strtol */ - if (rel && *pstr) { - haverel = 1; - *rel = atoi(pstr); - } - - return havename + havever + haverel; -} - /* * flags 0 = find installed * flags 1 = skip installed