diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-10-31 07:41:42 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-10-31 07:41:42 +0100 |
| commit | 5a8bbc99be0ec8ea264fca061276e9ec798bca5e (patch) | |
| tree | 0107af1d7d04ba0d67d6cf69d0b8bf1746f6137f /src/pacman/query.c | |
| parent | af2fb3324a925af6caa9d53aacac92173fc47885 (diff) | |
| download | pacman-5a8bbc99be0ec8ea264fca061276e9ec798bca5e.tar.gz pacman-5a8bbc99be0ec8ea264fca061276e9ec798bca5e.tar.xz | |
Numerous changes:
* Added 'ILoveCandy' support to all progress bars
* Changed download callback with regards to libfetch libalpm changes
* libfetch error output on failed sync
* Misc others I may have forgot to name (check the diff, heh)
Diffstat (limited to 'src/pacman/query.c')
| -rw-r--r-- | src/pacman/query.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/pacman/query.c b/src/pacman/query.c index 54828072..48d4cde5 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -46,6 +46,7 @@ static int query_fileowner(PM_DB *db, char *filename) int gotcha = 0; char rpath[PATH_MAX]; PM_LIST *lp; + long lroot; char *root; if(db == NULL) { @@ -61,7 +62,8 @@ static int query_fileowner(PM_DB *db, char *filename) return(1); } - alpm_get_option(PM_OPT_ROOT, (long *)&root); + alpm_get_option(PM_OPT_ROOT, &lroot); + root = (void *)&lroot; for(lp = alpm_db_getpkgcache(db); lp && !gotcha; lp = alpm_list_next(lp)) { PM_PKG *info; @@ -250,7 +252,7 @@ int pacman_query(list_t *targets) } } } else { - char *pkgname, *pkgver, changelog[PATH_MAX]; + char *pkgname = NULL, *pkgver = NULL, changelog[PATH_MAX]; info = alpm_db_readpkg(db_local, package); if(info == NULL) { @@ -261,8 +263,10 @@ int pacman_query(list_t *targets) /* find a target */ if(config->op_q_changelog || config->op_q_info || config->op_q_list) { if(config->op_q_changelog) { + long ldbpath; char *dbpath; - alpm_get_option(PM_OPT_DBPATH, (long *)&dbpath); + alpm_get_option(PM_OPT_DBPATH, &ldbpath); + dbpath = (void *)&ldbpath; snprintf(changelog, PATH_MAX, "%s%s/%s/%s-%s/changelog", config->root, dbpath, (char*)alpm_db_getinfo(db_local, PM_DB_TREENAME), |