- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] Fix warnings not usually emitted (CFLAGS not in configure.ac)
by Sebastian Nowicki 05 Apr '11

05 Apr '11

-Wbad-function-cast: * casting long int to pmpkgreason_t unecessarily * casting pmpkgreason_t to long unecessarily * casting off_t (signed integral) to float before division unecessarily -Wshadow: * shadowing "handle" variables renamed to "new_handle" and "local_handle" shadowing "filestr" renamed to "pkgfilestr" * shadowing "remove" renamed to "remove_pkgs" * shadowing "sync" renamed to "syncpkg" * Removed redundant declarations * shadowing "prefix" renamed to "entry_prefix" * shadowing "pipe" renamed to "pipe_handle" -Wconversion: * explicitely cast nread to size_t from ssize_t in dload.c (guaranteed not to be negative at this point) * use size_t, as opposed to int, for string length and byte sizes * use signed int in alpm_list_count as advertised by API (should probably be changed to usngiend int or size_t, but requires an API change) Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> --- Some of these warnings are quite pedantic and wouldn't really cause issues, so they might not be desired. The change in alpm_list_count is backwards in my opinion - the API should be changed to use unsigned int (or size_t). I didn't want to change the API though. This doesn't fix all the warnings. There are some where I had doubts about the semantics of the code, and some where the warnings would effectively just be suppressed (mostly regarding casting off_t to double/float for printing file sizes). lib/libalpm/alpm_list.c | 2 +- lib/libalpm/be_files.c | 2 +- lib/libalpm/conflict.c | 8 +++--- lib/libalpm/db.c | 2 +- lib/libalpm/deps.c | 12 +++++----- lib/libalpm/dload.c | 2 +- lib/libalpm/handle.c | 48 +++++++++++++++++++++++----------------------- lib/libalpm/sync.c | 21 +++++++++---------- lib/libalpm/util.c | 24 +++++++++++----------- src/pacman/package.c | 4 +- src/pacman/query.c | 5 +-- src/pacman/sync.c | 4 +-- src/pacman/upgrade.c | 1 - 13 files changed, 65 insertions(+), 70 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 80ba1ee..9afa950 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -576,7 +576,7 @@ void SYMEXPORT *alpm_list_getdata(const alpm_list_t *node) */ int SYMEXPORT alpm_list_count(const alpm_list_t *list) { - unsigned int i = 0; + int i = 0; const alpm_list_t *lp = list; while(lp) { ++i; diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 4432171..477b1d0 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -582,7 +582,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) if(fgets(line, sizeof(line), fp) == NULL) { goto error; } - info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line)); + info->reason = atol(_alpm_strtrim(line)); } else if(strcmp(line, "%SIZE%") == 0 || strcmp(line, "%CSIZE%") == 0) { /* NOTE: the CSIZE and SIZE fields both share the "size" field * in the pkginfo_t struct. This can be done b/c CSIZE diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 694c38d..9d6616a 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -400,7 +400,7 @@ static int dir_belongsto_pkg(char *dirpath, pmpkg_t *pkg) * 1: check every target against every target * 2: check every target against the filesystem */ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, - alpm_list_t *upgrade, alpm_list_t *remove) + alpm_list_t *upgrade, alpm_list_t *remove_pkgs) { alpm_list_t *i, *j, *conflicts = NULL; int numtargs = alpm_list_count(upgrade); @@ -495,7 +495,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, int resolved_conflict = 0; /* have we acted on this conflict? */ /* Check remove list (will we remove the conflicting local file?) */ - for(k = remove; k && !resolved_conflict; k = k->next) { + for(k = remove_pkgs; k && !resolved_conflict; k = k->next) { pmpkg_t *rempkg = k->data; if(rempkg && alpm_list_find_str(alpm_pkg_get_files(rempkg), filestr)) { _alpm_log(PM_LOG_DEBUG, "local file will be removed, not a conflict: %s\n", filestr); @@ -540,8 +540,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, FREE(rpath); continue; } - char *filestr = rpath + strlen(handle->root); - if(alpm_list_find_str(alpm_pkg_get_files(dbpkg),filestr)) { + char *pkgfilestr = rpath + strlen(handle->root); + if(alpm_list_find_str(alpm_pkg_get_files(dbpkg),pkgfilestr)) { resolved_conflict = 1; } free(rpath); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index c8a91a2..de297de 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -168,7 +168,7 @@ int SYMEXPORT alpm_db_setserver(pmdb_t *db, const char *url) alpm_list_t *i; int found = 0; char *newurl; - int len = 0; + size_t len = 0; ALPM_LOG_FUNC; diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index fd893a6..ff7af14 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -232,12 +232,12 @@ alpm_list_t SYMEXPORT *alpm_deptest(pmdb_t *db, alpm_list_t *targets) * Dependencies can include versions with depmod operators. * @param pkglist the list of local packages * @param reversedeps handles the backward dependencies - * @param remove an alpm_list_t* of packages to be removed + * @param remove_pkgs an alpm_list_t* of packages to be removed * @param upgrade an alpm_list_t* of packages to be upgraded (remove-then-upgrade) * @return an alpm_list_t* of pmpkg_t* of missing_t pointers. */ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps, - alpm_list_t *remove, alpm_list_t *upgrade) + alpm_list_t *remove_pkgs, alpm_list_t *upgrade) { alpm_list_t *i, *j; alpm_list_t *targets, *dblist = NULL, *modified = NULL; @@ -246,7 +246,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps, ALPM_LOG_FUNC; - targets = alpm_list_join(alpm_list_copy(remove), alpm_list_copy(upgrade)); + targets = alpm_list_join(alpm_list_copy(remove_pkgs), alpm_list_copy(upgrade)); for(i = pkglist; i; i = i->next) { void *pkg = i->data; if(alpm_list_find(targets, pkg, _alpm_pkg_cmp)) { @@ -585,7 +585,7 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, * searched first for any dependency packages needed to complete the * resolve, and to which will be added any [pkg] and all of its * dependencies not already on the list - * @param remove is the set of packages which will be removed in this + * @param remove_pkgs is the set of packages which will be removed in this * transaction * @param data returns the dependency which could not be satisfied in the * event of an error @@ -596,7 +596,7 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, */ int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pkg, alpm_list_t *preferred, alpm_list_t **packages, - alpm_list_t *remove, alpm_list_t **data) + alpm_list_t *remove_pkgs, alpm_list_t **data) { alpm_list_t *i, *j; alpm_list_t *targ; @@ -620,7 +620,7 @@ int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pk for(i = alpm_list_last(*packages); i; i = i->next) { pmpkg_t *tpkg = i->data; targ = alpm_list_add(NULL, tpkg); - deps = alpm_checkdeps(localpkgs, 0, remove, targ); + deps = alpm_checkdeps(localpkgs, 0, remove_pkgs, targ); alpm_list_free(targ); for(j = deps; j; j = j->next) { pmdepmissing_t *miss = j->data; diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 9b59f52..7d5a904 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -250,7 +250,7 @@ static int download_internal(const char *url, const char *localpath, while((nread = fetchIO_read(dlf, buffer, PM_DLBUF_LEN)) > 0) { check_stop(); size_t nwritten = 0; - nwritten = fwrite(buffer, 1, nread, localf); + nwritten = fwrite(buffer, 1, (size_t)nread, localf); if((nwritten != (size_t)nread) || ferror(localf)) { pm_errno = PM_ERR_RETRIEVE; _alpm_log(PM_LOG_ERROR, _("error writing to file '%s': %s\n"), diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index aa34cf4..6434044 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -44,48 +44,48 @@ pmhandle_t *handle = NULL; pmhandle_t *_alpm_handle_new() { - pmhandle_t *handle; + pmhandle_t *new_handle; ALPM_LOG_FUNC; - CALLOC(handle, 1, sizeof(pmhandle_t), RET_ERR(PM_ERR_MEMORY, NULL)); - handle->lckfd = -1; + CALLOC(new_handle, 1, sizeof(pmhandle_t), RET_ERR(PM_ERR_MEMORY, NULL)); + new_handle->lckfd = -1; - return(handle); + return(new_handle); } -void _alpm_handle_free(pmhandle_t *handle) +void _alpm_handle_free(pmhandle_t *local_handle) { ALPM_LOG_FUNC; - if(handle == NULL) { + if(local_handle == NULL) { return; } /* close logfile */ - if(handle->logstream) { - fclose(handle->logstream); - handle->logstream= NULL; + if(local_handle->logstream) { + fclose(local_handle->logstream); + local_handle->logstream= NULL; } - if(handle->usesyslog) { - handle->usesyslog = 0; + if(local_handle->usesyslog) { + local_handle->usesyslog = 0; closelog(); } /* free memory */ - _alpm_trans_free(handle->trans); - FREE(handle->root); - FREE(handle->dbpath); - FREELIST(handle->cachedirs); - FREE(handle->logfile); - FREE(handle->lockfile); - FREE(handle->arch); - FREELIST(handle->dbs_sync); - FREELIST(handle->noupgrade); - FREELIST(handle->noextract); - FREELIST(handle->ignorepkg); - FREELIST(handle->ignoregrp); - FREE(handle); + _alpm_trans_free(local_handle->trans); + FREE(local_handle->root); + FREE(local_handle->dbpath); + FREELIST(local_handle->cachedirs); + FREE(local_handle->logfile); + FREE(local_handle->lockfile); + FREE(local_handle->arch); + FREELIST(local_handle->dbs_sync); + FREELIST(local_handle->noupgrade); + FREELIST(local_handle->noextract); + FREELIST(local_handle->ignorepkg); + FREELIST(local_handle->ignoregrp); + FREE(local_handle); } alpm_cb_log SYMEXPORT alpm_option_get_logcb() diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index f819396..fab67c9 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -411,7 +411,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync alpm_list_t *deps = NULL; alpm_list_t *unresolvable = NULL; alpm_list_t *i, *j; - alpm_list_t *remove = NULL; + alpm_list_t *remove_pkgs = NULL; int ret = 0; ALPM_LOG_FUNC; @@ -435,7 +435,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync for(i = trans->add; i; i = i->next) { pmpkg_t *spkg = i->data; for(j = spkg->removes; j; j = j->next) { - remove = alpm_list_add(remove, j->data); + remove_pkgs = alpm_list_add(remove_pkgs, j->data); } } @@ -447,7 +447,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync for(i = trans->add; i; i = i->next) { pmpkg_t *pkg = i->data; if(_alpm_resolvedeps(localpkgs, dbs_sync, pkg, trans->add, - &resolved, remove, data) == -1) { + &resolved, remove_pkgs, data) == -1) { unresolvable = alpm_list_add(unresolvable, pkg); } /* Else, [resolved] now additionally contains [pkg] and all of its @@ -512,7 +512,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync for(i = deps; i; i = i->next) { pmconflict_t *conflict = i->data; - pmpkg_t *rsync, *sync, *sync1, *sync2; + pmpkg_t *rsync, *syncpkg, *sync1, *sync2; /* have we already removed one of the conflicting targets? */ sync1 = _alpm_pkg_find(trans->add, conflict->package1); @@ -529,10 +529,10 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync pmdepend_t *dep2 = _alpm_splitdep(conflict->package2); if(alpm_depcmp(sync1, dep2)) { rsync = sync2; - sync = sync1; + syncpkg = sync1; } else if(alpm_depcmp(sync2, dep1)) { rsync = sync1; - sync = sync2; + syncpkg = sync2; } else { _alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n")); pm_errno = PM_ERR_CONFLICTING_DEPS; @@ -555,7 +555,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync /* Prints warning */ _alpm_log(PM_LOG_WARNING, _("removing '%s' from target list because it conflicts with '%s'\n"), - rsync->name, sync->name); + rsync->name, syncpkg->name); trans->add = alpm_list_remove(trans->add, rsync, _alpm_pkg_cmp, NULL); _alpm_pkg_free_trans(rsync); /* rsync is not transaction target anymore */ continue; @@ -588,7 +588,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync _alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with '%s'\n", conflict->package1, conflict->package2); - pmpkg_t *sync = _alpm_pkg_find(trans->add, conflict->package1); + pmpkg_t *syncpkg = _alpm_pkg_find(trans->add, conflict->package1); pmpkg_t *local = _alpm_db_get_pkgfromcache(db_local, conflict->package2); int doremove = 0; QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, conflict->package1, @@ -596,7 +596,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync if(doremove) { /* append to the removes list */ _alpm_log(PM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2); - sync->removes = alpm_list_add(sync->removes, local); + syncpkg->removes = alpm_list_add(syncpkg->removes, local); } else { /* abort */ _alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n")); pm_errno = PM_ERR_CONFLICTING_DEPS; @@ -651,7 +651,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync cleanup: alpm_list_free(unresolvable); - alpm_list_free(remove); + alpm_list_free(remove_pkgs); return(ret); } @@ -894,7 +894,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) /* if we have deltas to work with */ if(handle->usedelta && deltas) { - int ret = 0; errors = 0; /* Check integrity of deltas */ EVENT(trans, PM_TRANS_EVT_DELTA_INTEGRITY_START, NULL, NULL); diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 5bf4ef1..c74649e 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -338,13 +338,13 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int /* If specific files were requested, skip entries that don't match. */ if(list) { - char *prefix = strdup(entryname); - char *p = strstr(prefix,"/"); + char *entry_prefix = strdup(entryname); + char *p = strstr(entry_prefix,"/"); if(p) { *(p+1) = '\0'; } - char *found = alpm_list_find_str(list, prefix); - free(prefix); + char *found = alpm_list_find_str(list, entry_prefix); + free(entry_prefix); if(!found) { if (archive_read_data_skip(_archive) != ARCHIVE_OK) { ret = 1; @@ -524,22 +524,22 @@ int _alpm_run_chroot(const char *root, const char *path, char *const argv[]) } else { /* this code runs for the parent only (wait on the child) */ int status; - FILE *pipe; + FILE *pipe_handle; close(pipefd[1]); - pipe = fdopen(pipefd[0], "r"); - if(pipe == NULL) { + pipe_handle = fdopen(pipefd[0], "r"); + if(pipe_handle == NULL) { close(pipefd[0]); retval = 1; } else { - while(!feof(pipe)) { + while(!feof(pipe_handle)) { char line[PATH_MAX]; - if(fgets(line, PATH_MAX, pipe) == NULL) + if(fgets(line, PATH_MAX, pipe_handle) == NULL) break; alpm_logaction("%s", line); EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); } - fclose(pipe); + fclose(pipe_handle); } while(waitpid(pid, &status, 0) == -1) { @@ -668,7 +668,7 @@ int _alpm_lstat(const char *path, struct stat *buf) { int ret; char *newpath = strdup(path); - int len = strlen(newpath); + size_t len = strlen(newpath); /* strip the trailing slash if one exists */ if(len != 0 && newpath[len - 1] == '/') { @@ -781,7 +781,7 @@ char *_alpm_archive_fgets(char *line, size_t size, struct archive *a) char *i; for(i = line; i < last; i++) { - int ret = archive_read_data(a, i, 1); + ssize_t ret = archive_read_data(a, i, 1); /* special check for first read- if null, return null, * this indicates EOF */ if(i == line && (ret <= 0 || *i == '\0')) { diff --git a/src/pacman/package.c b/src/pacman/package.c index ac84a0c..2b1faae 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -67,7 +67,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level) strftime(idatestr, 50, "%c", localtime(&idate)); } - switch((long)alpm_pkg_get_reason(pkg)) { + switch(alpm_pkg_get_reason(pkg)) { case PM_PKG_REASON_EXPLICIT: reason = _("Explicitly installed"); break; @@ -242,7 +242,7 @@ void dump_pkg_changelog(pmpkg_t *pkg) } else { /* allocate a buffer to get the changelog back in chunks */ char buf[CLBUF_SIZE]; - int ret = 0; + size_t ret = 0; while((ret = alpm_pkg_changelog_read(buf, CLBUF_SIZE, pkg, fp))) { if(ret < CLBUF_SIZE) { /* if we hit the end of the file, we need to add a null terminator */ diff --git a/src/pacman/query.c b/src/pacman/query.c index 5538e81..740da82 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -266,7 +266,6 @@ static int query_search(alpm_list_t *targets) static int query_group(alpm_list_t *targets) { alpm_list_t *i, *j; - char *grpname = NULL; int ret = 0; if(targets == NULL) { for(j = alpm_db_get_grpcache(db_local); j; j = alpm_list_next(j)) { @@ -283,8 +282,8 @@ static int query_group(alpm_list_t *targets) } } else { for(i = targets; i; i = alpm_list_next(i)) { + char *grpname = alpm_list_getdata(i); pmgrp_t *grp; - grpname = alpm_list_getdata(i); grp = alpm_db_readgrp(db_local, grpname); if(grp) { const alpm_list_t *p, *packages = alpm_grp_get_pkgs(grp); @@ -369,7 +368,7 @@ static int check(pmpkg_t *pkg) { alpm_list_t *i; const char *root; - int allfiles = 0, errors = 0; + unsigned int allfiles = 0, errors = 0; size_t rootlen; char f[PATH_MAX]; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index b9497d6..8970b5d 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -468,7 +468,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) pkgstr = target; for(j = syncs; j; j = alpm_list_next(j)) { - pmdb_t *db = alpm_list_getdata(j); + db = alpm_list_getdata(j); for(k = alpm_db_get_pkgcache(db); k; k = alpm_list_next(k)) { pmpkg_t *pkg = alpm_list_getdata(k); @@ -642,7 +642,6 @@ static int sync_trans(alpm_list_t *targets) pm_fprintf(stderr, PM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerrorlast()); switch(pm_errno) { - alpm_list_t *i; case PM_ERR_PKG_INVALID_ARCH: for(i = data; i; i = alpm_list_next(i)) { char *pkg = alpm_list_getdata(i); @@ -711,7 +710,6 @@ static int sync_trans(alpm_list_t *targets) pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerrorlast()); switch(pm_errno) { - alpm_list_t *i; case PM_ERR_FILE_CONFLICTS: for(i = data; i; i = alpm_list_next(i)) { pmfileconflict_t *conflict = alpm_list_getdata(i); diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index c9c8301..fcd1295 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -155,7 +155,6 @@ int pacman_upgrade(alpm_list_t *targets) pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerrorlast()); switch(pm_errno) { - alpm_list_t *i; case PM_ERR_FILE_CONFLICTS: for(i = data; i; i = alpm_list_next(i)) { pmfileconflict_t *conflict = alpm_list_getdata(i); -- 1.7.2.2

4 10

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.1-123-gc5addd9
by dan＠archlinux.org 05 Apr '11

05 Apr '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via c5addd94e3a817504688e684bf62786df7faa3e7 (commit) via 272e9b355b17ab663ac4a0d9515d381dcf6f03ec (commit) via ff1974c6e9aa97a6b0cf5e2ce82da70fd70c510c (commit) via 2f71d1dc0084f7ee44afb9766e81847974820420 (commit) via 40fd8123a292ad16610367922dbdff66460bc676 (commit) via 37df0d4f4fb042f8fbb39525d8d338968dd912bb (commit) via fc334b4e77553643bf9cdec47a4469ea7c62566b (commit) via 6a8b1c4f8433e95e713e3c6f152ba717c90d1dc9 (commit) via 38e5a4a54f1be3b678e5ab55b97f81be88824119 (commit) via 0458572a6e9db0030f305c25e951434a099ae754 (commit) via c37710734694c5a64da924bbfbbcfc07496e241e (commit) via a46183783504e01a505222c47d1f7fccfeec70e9 (commit) via 0e03c0849ddd799f60e6cf11084b8b62828cce89 (commit) via d8d89d8d27794d493ed2aa9eba4649e6e3ff4a9d (commit) via 7f6d986ac93e3465db6a4ed5c3ac77b72d890e68 (commit) via 39fd8bc318d4a90aab704f892cd80c22f5c7345f (commit) via 20c4928ee155db7b43b9f5b440a2cb199f178bb4 (commit) via a164c8405a0fb08cc7783d51796fbb76d0e4f493 (commit) via 541c2470b8ad8c1c0c925d2474da44384b5d7d66 (commit) via 3089c833ffa548d8965414d461bef023855dc34f (commit) from d3d18a42d2a12f65c51dec34608921cec7b42068 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c5addd94e3a817504688e684bf62786df7faa3e7 Merge: 2f71d1d 272e9b3 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 5 00:48:36 2011 -0500 Merge branch 'maint' Conflicts: lib/libalpm/be_sync.c lib/libalpm/db.c src/pacman/util.c commit 2f71d1dc0084f7ee44afb9766e81847974820420 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sat Apr 2 23:19:53 2011 +0200 pacman.c : useless extra parenthesis clang 3.0 git complained about these Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a46183783504e01a505222c47d1f7fccfeec70e9 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sat Apr 2 15:53:18 2011 +0200 dload: dont forget to initialize open_mode That's a funny one, building with optimization levels (with both gcc and clang) caused open_mode to always be set to "ab", which worked. This was spotted both with clang-analyzer, and by Jakob who reported a segfault as he was using an un-optimized build. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0e03c0849ddd799f60e6cf11084b8b62828cce89 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sat Apr 2 15:49:42 2011 +0200 configure.ac: we use fabs now so -lm is needed Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3089c833ffa548d8965414d461bef023855dc34f Author: Dan McGee <dan(a)archlinux.org> Date: Wed Mar 30 20:20:16 2011 -0500 Unify filelist operation functions in conflict checking We had two functions that were oh so similar but slightly different. We can combine them and add some conditional operation stuff to decide what to return. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 3 ++ lib/libalpm/be_local.c | 2 +- lib/libalpm/be_sync.c | 17 ++++++++-- lib/libalpm/conflict.c | 76 +++++++++++++++------------------------------- lib/libalpm/db.c | 2 +- lib/libalpm/dload.c | 3 +- lib/libalpm/package.c | 9 +++++ lib/libalpm/pkghash.c | 3 +- lib/libalpm/util.c | 1 + scripts/makepkg.sh.in | 25 +++++++-------- src/pacman/pacman.c | 2 +- src/pacman/util.c | 18 ++++++++--- test/util/vercmptest.sh | 2 +- 13 files changed, 83 insertions(+), 80 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.1-31-g272e9b3
by dan＠archlinux.org 05 Apr '11

05 Apr '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 272e9b355b17ab663ac4a0d9515d381dcf6f03ec (commit) via ff1974c6e9aa97a6b0cf5e2ce82da70fd70c510c (commit) via 40fd8123a292ad16610367922dbdff66460bc676 (commit) via 37df0d4f4fb042f8fbb39525d8d338968dd912bb (commit) via fc334b4e77553643bf9cdec47a4469ea7c62566b (commit) via 6a8b1c4f8433e95e713e3c6f152ba717c90d1dc9 (commit) via 38e5a4a54f1be3b678e5ab55b97f81be88824119 (commit) via 0458572a6e9db0030f305c25e951434a099ae754 (commit) via c37710734694c5a64da924bbfbbcfc07496e241e (commit) from d8d89d8d27794d493ed2aa9eba4649e6e3ff4a9d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 272e9b355b17ab663ac4a0d9515d381dcf6f03ec Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sat Apr 2 20:26:27 2011 +0200 libalpm/be_local.c: unused variable ent spotted by clang analyzer Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit ff1974c6e9aa97a6b0cf5e2ce82da70fd70c510c Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sat Apr 2 20:24:40 2011 +0200 libalpm/pkghash.c: unused variable ptr spotted by clang analyzer Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 40fd8123a292ad16610367922dbdff66460bc676 Author: Rémy Oudompheng <remyoudompheng(a)gmail.com> Date: Sat Apr 2 12:31:19 2011 +0200 makepkg: fix a GNU-ism in awk usage A non-GNU version of awk may not support the (|...) syntax for an optional group and require '()' to match an empty string. The (...)? syntax is more appropriate for this usage. Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 37df0d4f4fb042f8fbb39525d8d338968dd912bb Author: Allan McRae <allan(a)archlinux.org> Date: Thu Mar 31 11:08:55 2011 +1000 makepkg: improve parsing for sanity checks Trailing backslahses can lead to additional spaces at the front of extracted entries. See FS#23524. Strip these while parsing the PKGBUILD entries. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fc334b4e77553643bf9cdec47a4469ea7c62566b Author: Rémy Oudompheng <remyoudompheng(a)gmail.com> Date: Tue Apr 5 01:38:21 2011 +0200 db.c: set pm_errno appropriately in alpm_db_set_pkgreason() Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6a8b1c4f8433e95e713e3c6f152ba717c90d1dc9 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 2 13:51:25 2011 -0500 Coding style cleanups Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 38e5a4a54f1be3b678e5ab55b97f81be88824119 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 2 13:48:21 2011 -0500 test: fix invalid usage of 'type -p' The vercmptest script needs to be invoked as a bash script for this to be valid; the -p operator is interpreted as an argument to look up by sh. This goes way back to commit 3bf9448943dc0b, done to solve http://mailman.archlinux.org/pipermail/pacman-dev/2008-July/007180.html. Saw this problem running in a virtual machine where sh is not bash, but in fact dash: user@debian-powerpc:~/projects/pacman$ ./test/util/vercmptest.sh src/util/vercmp-p: not found src/util/vercmp is src/util/vercmp vercmp binary (src/util/vercmp) could not be located Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0458572a6e9db0030f305c25e951434a099ae754 Author: Rémy Oudompheng <remyoudompheng(a)gmail.com> Date: Sat Apr 2 00:36:08 2011 +0200 util.c: include limits.h for PATH_MAX macro Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c37710734694c5a64da924bbfbbcfc07496e241e Author: Rémy Oudompheng <remyoudompheng(a)gmail.com> Date: Sat Apr 2 00:35:37 2011 +0200 Fix compatibility with older versions of libarchive. There is no reason to not support versions of libarchive that lack ARCHIVE_COMPRESSION_UU. Distributions should work properly without this. Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_local.c | 2 +- lib/libalpm/be_sync.c | 2 ++ lib/libalpm/db.c | 2 +- lib/libalpm/pkghash.c | 3 +-- lib/libalpm/util.c | 1 + scripts/makepkg.sh.in | 10 +++++----- src/pacman/util.c | 13 ++++++++----- test/util/vercmptest.sh | 2 +- 8 files changed, 20 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove dead stores reported by clang-analyzer
by Sebastian Nowicki 05 Apr '11

05 Apr '11

Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> --- lib/libalpm/be_local.c | 2 +- lib/libalpm/pkghash.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 82c1d59..788b3c6 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -405,7 +405,7 @@ static int local_db_populate(pmdb_t *db) * http://kerneltrap.org/mailarchive/linux-btrfs/2010/1/23/6723483/thread */ est_count = 0; - while((ent = readdir(dbdir)) != NULL) { + while(readdir(dbdir) != NULL) { est_count++; } rewinddir(dbdir); diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index 761ca72..b4dfcb6 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -84,12 +84,11 @@ pmpkghash_t *_alpm_pkghash_create(size_t size) static size_t get_hash_position(unsigned long name_hash, pmpkghash_t *hash) { size_t position; - alpm_list_t *ptr; position = name_hash % hash->buckets; /* collision resolution using open addressing with linear probing */ - while((ptr = hash->hash_table[position]) != NULL) { + while(hash->hash_table[position] != NULL) { position = (position + 1) % hash->buckets; } -- 1.7.4.2

4 5

[pacman-dev] gnu89-inline
by Xavier Chantry 05 Apr '11

05 Apr '11

I am just curious, what do we need this flag for ? I only found this : http://gcc.gnu.org/onlinedocs/gcc/Inline.html GCC implements three different semantics of declaring a function inline. One is available with -std=gnu89 or -fgnu89-inline or when gnu_inline attribute is present on all inline declarations, another when -std=c99, -std=c1x, -std=gnu99 or -std=gnu1x (without -fgnu89-inline), and the third is used when compiling C++. There is a small annoyance with clang, the configure check believes fgnu89-inline is supported because clang only emits a warning when that flag is specified : checking for -fgnu89-inline... yes So every libalpm file triggers this warning when building : clang: warning: argument unused during compilation: '-fgnu89-inline' Anyway it looks like we could use -std=gnu89 alternatively ? ... which brings to another topic that was brought recently on the ML : I tried to build with that and got a lot of warnings :) ../../lib/libalpm/alpm.h:396:29: warning: commas at the end of enumerator lists are a C99-specific feature [-pedantic] pacman.c:1201:8: warning: ISO C90 forbids mixing declarations and code [-Wdeclaration-after-statement] util.c:797:8: warning: variable declaration in for loop is a C99-specific feature [-pedantic] ...

3 8

[pacman-dev] [PATCH] db.c: set pm_errno appropriately in alpm_db_set_pkgreason()
by Rémy Oudompheng 04 Apr '11

04 Apr '11

Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> --- Discovered while working on pyalpm. On branch 'maint' lib/libalpm/db.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index d9ed331..49bbd00 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -331,7 +331,7 @@ int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t pkg->reason = reason; /* write DESC */ if(_alpm_local_db_write(db, pkg, INFRQ_DESC)) { - return(-1); + RET_ERR(PM_ERR_DB_WRITE, -1); } return(0); -- 1.7.4.2

1 0

[pacman-dev] [pyalpm] released version 0.2
by Rémy Oudompheng 04 Apr '11

04 Apr '11

Hello, pyalpm version 0.2 is available at ftp://ftp.archlinux.org/other/pyalpm/pyalpm-0.2.tar.gz There is also a PKGBUILD on AUR. I have not really wrapped more libalpm functions, but I have begun writing a clone of pacman in Python. The goal is multiple: * have Python modules giving access to pacman functionalities which are not strictly in libalpm (like configuration via pacman.conf) * have an easy way to test the bindings more extensively * provide material allowing to hack quickly a pacman variant * see how the use of another language affects pacman's code * have fun For the moment, it is in a very early stage and only gives access to simple database lookup functions. The script is called pycman and supports options -Q[ilq], -S[iglq], -T. pycman/pyalpm works with Python 3.2 (needed for argparse module) and libalpm from pacman 3.5 (the current targeted API). -- Rémy.

2 2

[pacman-dev] [PATCH 0/3] FreeBSD compile fixes
by Rémy Oudompheng 02 Apr '11

02 Apr '11

Pacman no longer compiles on FreeBSD (tried with version 8.2). * FreeBSD ships with libarchive 2.7.0 that has slightly fewer macros * diskspace.c does not have strict enough #ifdef's (for statfs/statvfs) * util.c does not include <limits.h> for PATH_MAX constant (that's what `man limits.h` and the POSIX spec say at least) The following patches fix compilation on FreeBSD (and do not break the testsuite on Archlinux). Note the additional dependencies for the testsuite: * fakeroot * python 2.6 or 2.7 * GNU make (due to wildcard usage in testsuite's Makefile.am) To apply on branch 'maint'. Rémy Oudompheng (3): Fix compatibility with older versions of libarchive. util.c: include limits.h for PATH_MAX macro diskspace: add the actually used statfs type in ifdefs acinclude.m4 | 8 ++++++-- lib/libalpm/be_sync.c | 2 ++ lib/libalpm/diskspace.c | 4 ++-- lib/libalpm/util.c | 1 + 4 files changed, 11 insertions(+), 4 deletions(-) -- 1.7.4.2

3 9

[pacman-dev] [PATCH 1/2] configure.ac: we use fabs now so -lm is needed
by Xavier Chantry 02 Apr '11

02 Apr '11

Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- configure.ac | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 3299302..9fb9cb0 100644 --- a/configure.ac +++ b/configure.ac @@ -131,6 +131,9 @@ AC_PATH_PROGS([BASH_SHELL], [bash bash4 bash3], [false]) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION(0.13.1) +AC_CHECK_LIB([m], [fabs], , + AC_MSG_ERROR([libm is needed to compile pacman!])) + # Check for libarchive AC_CHECK_LIB([archive], [archive_read_data], , AC_MSG_ERROR([libarchive is needed to compile pacman!])) -- 1.7.4.2

2 2

[pacman-dev] [PATCH] pacman-key: better handling of options and supressing gpg output
by Denis A. Altoé Falqueto 01 Apr '11

01 Apr '11

The option --trust was changed to --edit-key, for better alignment with the underlying --edit-key of gnupg. The options --config and --gpgdir were not being handled correctly. They would not work if were not used as first arguments always. Now the handling is more flexible. The use of gpg for verification purposes was leaking inconvenient messages to the output, so they were quieted with --quiet, 1>/dev/null and 2>&1. The check for existence of gpg and if user is root was put in a function and called just when needed. Signed-off-by: Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> --- This patch is a remake of this one: http://mailman.archlinux.org/pipermail/pacman-dev/2011-February/012457.html. It is adapted for master branch. I've applied some suggestions from other emails regarding that implementation, like a function to check if gpg exists and if user is root. It is called just if an operation needs to check it, avoiding a special casing for -h or -v. doc/pacman-key.8.txt | 4 +- scripts/pacman-key.sh.in | 137 ++++++++++++++++++++++++++++++---------------- 2 files changed, 92 insertions(+), 49 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 8a08480..e806b81 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -68,8 +68,8 @@ Commands *\--reload*:: Reloads the keys from the keyring package. -*-t, \--trust* keyid:: - Set the trust level of the given key. +*-t*, *\--edit-key* 'keyid ...':: + Edit trust properties for the given keys *-u, \--updatedb*:: Equivalent to \--check-trustdb in GnuPG. diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 89e52fc..2b19611 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -66,7 +66,7 @@ usage() { echo "$(gettext " -h, --help This help")" echo "$(gettext " -l, --list List keys")" echo "$(gettext " -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids")" - echo "$(gettext " -t, --trust <keyid(s)> Set the trust level of the given keyids")" + echo "$(gettext " -t, --edit-key <keyid> ... edit trust properties for the given keys")" echo "$(gettext " -u, --updatedb Update the trustdb of pacman")" echo "$(gettext " -V, --version Show program version")" echo "$(gettext " --adv <params> Use pacman's keyring with advanced gpg commands")" @@ -110,7 +110,7 @@ reload_keyring() { # Verify signatures of related files, if they exist if [[ -r "${ADDED_KEYS}" ]]; then msg "$(gettext "Verifying official keys file signature...")" - if ! ${GPG_PACMAN} --quiet --batch --verify "${ADDED_KEYS}.sig" 1>/dev/null; then + if ! ${GPG_PACMAN} --verify "${ADDED_KEYS}.sig" &>/dev/null; then error "$(gettext "The signature of file %s is not valid.")" "${ADDED_KEYS}" exit 1 fi @@ -118,7 +118,7 @@ reload_keyring() { if [[ -r "${DEPRECATED_KEYS}" ]]; then msg "$(gettext "Verifying deprecated keys file signature...")" - if ! ${GPG_PACMAN} --quiet --batch --verify "${DEPRECATED_KEYS}.sig" 1>/dev/null; then + if ! ${GPG_PACMAN} --verify "${DEPRECATED_KEYS}.sig" &>/dev/null; then error "$(gettext "The signature of file %s is not valid.")" "${DEPRECATED_KEYS}" exit 1 fi @@ -126,7 +126,7 @@ reload_keyring() { if [[ -r "${REMOVED_KEYS}" ]]; then msg "$(gettext "Verifying deleted keys file signature...")" - if ! ${GPG_PACMAN} --quiet --batch --verify "${REMOVED_KEYS}.sig"; then + if ! ${GPG_PACMAN} --verify "${REMOVED_KEYS}.sig" &>/dev/null; then error "$(gettext "The signature of file %s is not valid.")" "${REMOVED_KEYS}" exit 1 fi @@ -204,14 +204,8 @@ reload_keyring() { ${GPG_PACMAN} --batch --check-trustdb } -# PROGRAM START -if ! type gettext &>/dev/null; then - gettext() { - echo "$@" - } -fi - -if [[ $1 != "--version" && $1 != "-V" && $1 != "--help" && $1 != "-h" && $1 != "" ]]; then +# Checks if gpg exists and user is root +function check_environment() { if type -p gpg >/dev/null 2>&1 = 1; then error "$(gettext "gnupg does not seem to be installed.")" msg2 "$(gettext "pacman-key requires gnupg for most operations.")" @@ -220,17 +214,49 @@ if [[ $1 != "--version" && $1 != "-V" && $1 != "--help" && $1 != "-h" && $1 != " error "$(gettext "pacman-key needs to be run as root.")" exit 1 fi +} + +# PROGRAM START +if ! type gettext &>/dev/null; then + gettext() { + echo "$@" + } fi -# Parse global options +# Iterate over the parameters to get --config and --gpgdir +# The other parameters will be filtered to another array, +# so --config and --gpgdir don't interfere with other options. CONFIG="@sysconfdir@/pacman.conf" -PACMAN_KEYRING_DIR="@sysconfdir@/pacman.d/gnupg" -while [[ $1 =~ ^--(config|gpgdir)$ ]]; do - case "$1" in - --config) shift; CONFIG="$1" ;; - --gpgdir) shift; PACMAN_KEYRING_DIR="$1" ;; +declare -a PARAMS +GPGDIR="" +isconfig=0 +isgpgdir=0 +for arg in "$@"; do + if (( isconfig )); then + isconfig=0 + CONFIG="$arg" + if [[ ! -f "$CONFIG" ]]; then + error "$(gettext "The configuration file is not a valid file.")" + usage + exit 1 + fi + continue + fi + if (( isgpgdir )); then + isgpgdir=0 + GPGDIR="$arg" + if [[ ! -d "$GPGDIR" ]]; then + error "$(gettext "The home directory for GnuPG is not valid.")" + usage + exit 1 + fi + continue + fi + case "$arg" in + --config) isconfig=1;; + --gpgdir) isgpgdir=1;; + *) PARAMS[${#PARAMS[@]}]="$arg" esac - shift done if [[ ! -r "${CONFIG}" ]]; then @@ -239,11 +265,13 @@ if [[ ! -r "${CONFIG}" ]]; then fi # Read GPGDIR from $CONFIG. -# The pattern is: any spaces or tabs, GPGDir, any spaces or tabs, equal sign -# and the rest of the line. The string is splitted after the first occurrence of = -if [[ GPGDIR=$(find_config "GPGDir") == 0 ]]; then - PACMAN_KEYRING_DIR="${GPGDIR}" -fi +# The precedence for GPGDIR is: +# 1st: command line +# 2nd: pacman.conf +# 3rd: default value +[[ -z "$GPGDIR" ]] && GPGDIR=$(find_config "GPGDir") +[[ -z "$GPGDIR" ]] && GPGDIR="@sysconfdir@/pacman.d/gnupg" +PACMAN_KEYRING_DIR="${GPGDIR}" GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning" # Try to create $PACMAN_KEYRING_DIR if non-existent @@ -252,74 +280,89 @@ GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning" [[ -e ${PACMAN_KEYRING_DIR} ]] || mkdir -p -m 755 "${PACMAN_KEYRING_DIR}" # Parse and execute command -command="$1" +command="${PARAMS[0]}" if [[ -z "${command}" ]]; then usage exit 1 fi -shift +unset PARAMS[0] case "${command}" in -a|--add) + check_environment # If there is no extra parameter, gpg will read stdin - ${GPG_PACMAN} --quiet --batch --import "$@" + ${GPG_PACMAN} --quiet --batch --import "${PARAMS[@]}" ;; -d|--del) - if (( $# == 0 )); then + check_environment + if (( ${#PARAMS[@]} == 0 )); then error "$(gettext "You need to specify at least one key identifier")" exit 1 fi - ${GPG_PACMAN} --quiet --batch --delete-key --yes "$@" + ${GPG_PACMAN} --quiet --batch --delete-key --yes "${PARAMS[@]}" ;; -u|--updatedb) + check_environment ${GPG_PACMAN} --batch --check-trustdb ;; --reload) + check_environment reload_keyring ;; -l|--list) - ${GPG_PACMAN} --batch --list-sigs "$@" + check_environment + ${GPG_PACMAN} --list-sigs "${PARAMS[@]}" ;; -f|--finger) - ${GPG_PACMAN} --batch --fingerprint "$@" + check_environment + ${GPG_PACMAN} --fingerprint "${PARAMS[@]}" ;; -e|--export) - ${GPG_PACMAN} --armor --export "$@" + check_environment + ${GPG_PACMAN} --armor --export "${PARAMS[@]}" ;; -r|--receive) - if (( $# < 2 )); then + check_environment + if (( ${#PARAMS[@]} < 2 )); then error "$(gettext "You need to specify the keyserver and at least one key identifier")" exit 1 fi - keyserver="$1" - shift - ${GPG_PACMAN} --keyserver "${keyserver}" --recv-keys "$@" + keyserver="${PARAMS[1]}" + unset PARAMS[1] + ${GPG_PACMAN} --keyserver "${keyserver}" --recv-keys "${PARAMS[@]}" ;; - -t|--trust) - if (( $# == 0 )); then + -t|--edit-key) + check_environment + if (( ${#PARAMS[@]} == 0 )); then error "$(gettext "You need to specify at least one key identifier")" + usage exit 1 fi - while (( $# > 0 )); do - # Verify if the key exists in pacman's keyring - if ${GPG_PACMAN} --list-keys "$1" > /dev/null 2>&1; then - ${GPG_PACMAN} --edit-key "$1" - else - error "$(gettext "The key identified by %s doesn't exist")" "$1" - exit 1 + for key in "${PARAMS[@]}"; do + if [[ -n "$key" ]]; then + # Verify if the key exists in pacman's keyring + if ${GPG_PACMAN} --list-keys "$key" &>/dev/null; then + ${GPG_PACMAN} --edit-key "$key" + else + error "$(gettext "The key identified by %s doesn't exist")" "$key" + exit 1 + fi fi - shift done ;; --adv) + check_environment msg "$(gettext "Executing: %s ")$*" "${GPG_PACMAN}" - ${GPG_PACMAN} "$@" || ret=$? + ${GPG_PACMAN} "${PARAMS[@]}" || ret=$? exit $ret ;; -h|--help) usage; exit 0 ;; -V|--version) version; exit 0 ;; + # Parameters already handled + --config) shift ;; + --gpgdir) shift ;; *) usage; exit 1 ;; esac -- 1.7.4.2

1 0