#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;
/* everything up to the first '-' is in the name */
while (*pstr) {
+ if (*pstr == '\'' || !isgraph(*pstr)) {
+ return 0;
+ }
if (*pstr == '-' && isdigit(*(pstr+1))) {
break;
}
pstr++;
}
while (*pstr && *pstr != '-') {
+ if (*pstr == '\'' || !isgraph(*pstr)) {
+ return 0;
+ }
if (ver) {
*ver++ = *pstr;
}
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'",
// 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
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);
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((const char *)sqlite3_column_text(stmt, 0));
+ pkgid = strdup((const char *)sqlite3_column_text(stmt, 0));
break;
case SQLITE_DONE:
/* not found */
}
sqlite3_finalize(stmt);
- return zpm->pkgid;
+ return pkgid;
}