add vercmp at zpm open or init

[zpackage] / lib / findpkg.c

diff --git a/lib/findpkg.c b/lib/findpkg.c
index 732f1bb193d3762494886030afa425242c7a494d..900b6cbc74ebd51bfb5ce0184d95715793e72c60 100644 (file)
--- a/lib/findpkg.c
+++ b/lib/findpkg.c
@@ -9,6 +9,8 @@
 
 #include "sqlite3.h"
 
+#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;
@@ -30,6 +32,9 @@ int zpm_parse_package(char *pstr, char *name, char *ver, int *rel) {
 
        /* everything up to the first '-' is in the name */
        while (*pstr) {
+               if (*pstr == '\'' || !isgraph(*pstr)) {
+                       return 0;
+               }
                if (*pstr == '-' && isdigit(*(pstr+1))) {
                        break;
                }
@@ -44,6 +49,9 @@ int zpm_parse_package(char *pstr, char *name, char *ver, int *rel) {
                pstr++;
        }
        while (*pstr && *pstr != '-') {
+               if (*pstr == '\'' || !isgraph(*pstr)) {
+                       return 0;
+               }
                if (ver) {
                        *ver++ = *pstr;
                }
@@ -83,12 +91,12 @@ struct zpm_package *zpm_package_alloc(struct zpm *zpm) {
 void zpm_sqlite_error(struct zpm *zpm) {
        zpm->error = 1;
        if (zpm->errmsg) free(zpm->errmsg);
-       zpm->errmsg = strdup(sqlite3_errmsg(zpm->db));
+       zpm->errmsg = strdup((const char *)sqlite3_errmsg(zpm->db));
 }
 
 char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
        char *select = "select pkgid, package, version, release from packages_pkgid";
-       char *group = "group by package having max( version||'-'||release collate vercmp) order by length(package), package, version||'-'||release collate vercmp limit 1";
+       char *group = "group by package having max( version||'-'||release collate vercmp) order by length(package), package, version||'-'||release collate vercmp";
 #if 0
        char *sstr[] = {
                "status = 'installed'",
@@ -100,11 +108,16 @@ char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
 //     char *order = "order by package, version collate vercmp, cast(release as integer)";
        sqlite3_str *sql;
        sqlite3_stmt *stmt;
-       char *query;
+       char *query, *pkgid = 0;
        char package[32];
        char version[32];
        int release;
 
+       if (pkgstr == NULL) {
+               fprintf(stderr, "trying to parse null string\n");
+               return NULL;
+       }
+
        /* null pkgstr find "best" package
         * best is shortest complete package if any are complete
         * shortest incomplete if any are incomplete
@@ -126,9 +139,9 @@ char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
 
        sql = sqlite3_str_new(zpm->db);
        sqlite3_str_appendall(sql, select);
-       sqlite3_str_appendf(sql, " where package = %q", package);
+       sqlite3_str_appendf(sql, " where package = %Q", package);
        if (*version) {
-               sqlite3_str_appendf(sql, " and version = %q", version);
+               sqlite3_str_appendf(sql, " and version = %Q", version);
        }
        if (release) {
                sqlite3_str_appendf(sql, " and release = %d", release);
@@ -146,12 +159,16 @@ char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
        sqlite3_prepare_v2(zpm->db, query, strlen(query), &stmt, NULL);
        sqlite3_free(query);
 
-       free(zpm->pkgid);
+#if 0
+       if (zpm->pkgid) {
+               free(zpm->pkgid);
+       }
        zpm->pkgid = 0;
+#endif
 
        switch (sqlite3_step(stmt)) {
                case SQLITE_ROW:
-                       zpm->pkgid = strdup(sqlite3_column_text(stmt, 0));
+                       pkgid = strdup((const char *)sqlite3_column_text(stmt, 0));
                        break;
                case SQLITE_DONE:
                        /* not found */
@@ -162,5 +179,5 @@ char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
        }
        sqlite3_finalize(stmt);
 
-       return zpm->pkgid;
+       return pkgid;
 }