August 2014 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 11/11] replace strdup with STRDUP
by Andrew Gregory 01 Aug '14

01 Aug '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/diskspace.c | 6 +++--- lib/libalpm/handle.c | 10 +++------- lib/libalpm/package.c | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 606f2dc..af87f75 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -112,7 +112,7 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) while((mnt = getmntent(fp))) { CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - mp->mount_dir = strdup(mnt->mnt_dir); + STRDUP(mp->mount_dir, mnt->mnt_dir, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); mp->mount_dir_len = strlen(mp->mount_dir); mount_points = alpm_list_add(mount_points, mp); @@ -135,7 +135,7 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) while((ret = getmntent(fp, &mnt)) == 0) { CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - mp->mount_dir = strdup(mnt->mnt_mountp); + STRDUP(mp->mount_dir, mnt->mnt_mountp, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); mp->mount_dir_len = strlen(mp->mount_dir); mount_points = alpm_list_add(mount_points, mp); @@ -162,7 +162,7 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) for(; entries-- > 0; fsp++) { CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - mp->mount_dir = strdup(fsp->f_mntonname); + STRDUP(mp->mount_dir, fsp->f_mntonname, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); mp->mount_dir_len = strlen(mp->mount_dir); memcpy(&(mp->fsp), fsp, sizeof(FSSTATSTYPE)); #if defined(HAVE_GETMNTINFO_STATVFS) && defined(HAVE_STRUCT_STATVFS_F_FLAG) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 0efc0a9..fdd269b 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -417,7 +417,7 @@ int SYMEXPORT alpm_option_set_logfile(alpm_handle_t *handle, const char *logfile return -1; } - handle->logfile = strdup(logfile); + STRDUP(handle->logfile, logfile, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); /* free the old logfile path string, and close the stream so logaction * will reopen a new stream on the new logfile */ @@ -443,7 +443,7 @@ int SYMEXPORT alpm_option_set_gpgdir(alpm_handle_t *handle, const char *gpgdir) if(handle->gpgdir) { FREE(handle->gpgdir); } - handle->gpgdir = strdup(gpgdir); + STRDUP(handle->gpgdir, gpgdir, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); _alpm_log(handle, ALPM_LOG_DEBUG, "option 'gpgdir' = %s\n", handle->gpgdir); return 0; @@ -549,11 +549,7 @@ int SYMEXPORT alpm_option_set_arch(alpm_handle_t *handle, const char *arch) { CHECK_HANDLE(handle, return -1); if(handle->arch) FREE(handle->arch); - if(arch) { - handle->arch = strdup(arch); - } else { - handle->arch = NULL; - } + STRDUP(handle->arch, arch, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); return 0; } diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index e8863f6..a69f454 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -613,7 +613,7 @@ int _alpm_pkg_dup(alpm_pkg_t *pkg, alpm_pkg_t **new_ptr) newpkg->infolevel = pkg->infolevel; newpkg->origin = pkg->origin; if(newpkg->origin == ALPM_PKG_FROM_FILE) { - newpkg->origin_data.file = strdup(pkg->origin_data.file); + STRDUP(newpkg->origin_data.file, pkg->origin_data.file, goto cleanup); } else { newpkg->origin_data.db = pkg->origin_data.db; } -- 2.0.2

1 0

[pacman-dev] [PATCH 10/11] sync.c: fix style violations
by Andrew Gregory 01 Aug '14

01 Aug '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/sync.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index bf19d57..4609186 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -600,11 +600,12 @@ static int process_group(alpm_list_t *dbs, const char *group, int error) } if(config->print == 0) { + char *array = malloc(count); + int n = 0; colon_printf(_n("There is %d member in group %s:\n", "There are %d members in group %s:\n", count), count, group); select_display(pkgs); - char *array = malloc(count); if(!array) { ret = 1; goto cleanup; @@ -614,12 +615,13 @@ static int process_group(alpm_list_t *dbs, const char *group, int error) free(array); goto cleanup; } - int n = 0; - for(i = pkgs; i; i = alpm_list_next(i)) { - if(array[n++] == 0) - continue; + for(i = pkgs, n = 0; i; i = alpm_list_next(i)) { alpm_pkg_t *pkg = i->data; + if(array[n++] == 0) { + continue; + } + if(process_pkg(pkg) == 1) { ret = 1; free(array); -- 2.0.2

1 0

[pacman-dev] [PATCH 09/11] pacman.c: simplify stdin parsing
by Andrew Gregory 01 Aug '14

01 Aug '14

Incorporate memory exhaustion and end-of-stream checks into the main loop. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 12a4f7a..345fb0a 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1087,9 +1087,9 @@ int main(int argc, char *argv[]) free(vdata); i = 0; - while((c = fgetc(stdin)) != EOF) { - line[i] = (char)c; - if(isspace((unsigned char)line[i])) { + do { + c = fgetc(stdin); + if(c == EOF || isspace(c)) { /* avoid adding zero length arg when multiple spaces separate args */ if(i > 0) { line[i] = '\0'; @@ -1098,7 +1098,7 @@ int main(int argc, char *argv[]) i = 0; } } else { - i++; + line[i++] = (char)c; /* we may be at the end of our allocated buffer now */ if(i >= current_size) { char *new = realloc(line, current_size * 2); @@ -1107,25 +1107,14 @@ int main(int argc, char *argv[]) current_size *= 2; } else { free(line); - line = NULL; - break; + pm_printf(ALPM_LOG_ERROR, + _("memory exhausted in argument parsing\n")); + cleanup(EXIT_FAILURE); } } } - } - - /* check for memory exhaustion */ - if(!line) { - pm_printf(ALPM_LOG_ERROR, _("memory exhausted in argument parsing\n")); - cleanup(EXIT_FAILURE); - } + } while(c != EOF); - /* end of stream -- check for data still in line buffer */ - if(i > 0) { - line[i] = '\0'; - pm_targets = alpm_list_add(pm_targets, strdup(line)); - target_found = 1; - } free(line); if(!freopen(ctermid(NULL), "r", stdin)) { pm_printf(ALPM_LOG_ERROR, _("failed to reopen stdin for reading: (%s)\n"), -- 2.0.2

1 0

[pacman-dev] [PATCH 07/11] handle_unlock: log lock removal failure
by Andrew Gregory 01 Aug '14

01 Aug '14

Rather than have individual callers log failure, just do it directly in _alpm_handle_unlock. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/be_sync.c | 6 +----- lib/libalpm/handle.c | 4 ++++ lib/libalpm/trans.c | 7 +------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index df0b1b7..4b67f42 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -291,11 +291,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) } cleanup: - - if(_alpm_handle_unlock(handle)) { - _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"), - handle->lockfile); - } + _alpm_handle_unlock(handle); free(syncpath); umask(oldmask); return ret; diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index b218a68..234fc4d 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -126,6 +126,10 @@ int _alpm_handle_unlock(alpm_handle_t *handle) handle->lockfd = -1; if(unlink(handle->lockfile) && errno != ENOENT) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not remove lock file %s\n"), handle->lockfile); + alpm_logaction(handle, ALPM_CALLER_PREFIX, + "warning: could not remove lock file %s\n", handle->lockfile); return -1; } return 0; diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index e5328c5..68f6633 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -231,12 +231,7 @@ int SYMEXPORT alpm_trans_release(alpm_handle_t *handle) /* unlock db */ if(!nolock_flag) { - if(_alpm_handle_unlock(handle)) { - _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"), - handle->lockfile); - alpm_logaction(handle, ALPM_CALLER_PREFIX, - "warning: could not remove lock file %s\n", handle->lockfile); - } + _alpm_handle_unlock(handle); } return 0; -- 2.0.2

1 0

[pacman-dev] [PATCH 06/11] signing.c: remove useless error check
by Andrew Gregory 01 Aug '14

01 Aug '14

CHECK_ERR checks gpg_err which is a local variable. Calling gpg_op_import_result cannot modify it. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/signing.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index e46fa2e..c0fb006 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -404,7 +404,6 @@ static int key_import(alpm_handle_t *handle, alpm_pgpkey_t *key) gpg_err = gpgme_op_import_keys(ctx, keys); CHECK_ERR(); result = gpgme_op_import_result(ctx); - CHECK_ERR(); /* we know we tried to import exactly one key, so check for this */ if(result->considered != 1 || !result->imports) { _alpm_log(handle, ALPM_LOG_DEBUG, "could not import key, 0 results\n"); -- 2.0.2

1 0

[pacman-dev] [PATCH 05/11] deps.c: use alpm_list_find_ptr
by Andrew Gregory 01 Aug '14

01 Aug '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/deps.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index adbccd1..c5acfc9 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -90,11 +90,6 @@ static alpm_pkg_t *find_dep_satisfier(alpm_list_t *pkgs, alpm_depend_t *dep) return NULL; } -static int ptr_cmp(const void *p, const void *q) -{ - return (p != q); -} - /* Convert a list of alpm_pkg_t * to a graph structure, * with a edge for each dependency. * Returns a list of vertices (one vertex = one package) @@ -201,14 +196,14 @@ alpm_list_t *_alpm_sortbydeps(alpm_handle_t *handle, /* child is an ancestor of vertex */ alpm_graph_t *transvertex = vertex; - if(!alpm_list_find(targets, nextchild->data, ptr_cmp)) { + if(!alpm_list_find_ptr(targets, nextchild->data)) { /* child is not part of the transaction, not a problem */ continue; } /* find the nearest parent that's part of the transaction */ while(transvertex) { - if(alpm_list_find(targets, transvertex->data, ptr_cmp)) { + if(alpm_list_find_ptr(targets, transvertex->data)) { break; } transvertex = transvertex->parent; @@ -234,7 +229,7 @@ alpm_list_t *_alpm_sortbydeps(alpm_handle_t *handle, } } if(!found) { - if(alpm_list_find(targets, vertex->data, ptr_cmp)) { + if(alpm_list_find_ptr(targets, vertex->data)) { newtargs = alpm_list_add(newtargs, vertex->data); } /* mark that we've left this vertex */ -- 2.0.2

1 0

[pacman-dev] [PATCH 04/11] dep_graph_init: filter ignored packages by name
by Andrew Gregory 01 Aug '14

01 Aug '14

Ignored packages are from the transaction remove list which consists of duplicated packages so a direct pointer comparison is not appropriate. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/deps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 1cbbc5f..adbccd1 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -106,7 +106,7 @@ static alpm_list_t *dep_graph_init(alpm_handle_t *handle, alpm_list_t *i, *j; alpm_list_t *vertices = NULL; alpm_list_t *localpkgs = alpm_list_diff( - alpm_db_get_pkgcache(handle->db_local), ignore, ptr_cmp); + alpm_db_get_pkgcache(handle->db_local), ignore, _alpm_pkg_cmp); /* We create the vertices */ for(i = targets; i; i = i->next) { -- 2.0.2

1 0

[pacman-dev] [PATCH 03/11] pactest: delay test object creation
by Andrew Gregory 01 Aug '14

01 Aug '14

The actual test object is only used to run the test. Storing test cases as strings limits the test object scope and allows it to be garbage collected, reducing memory usage when multiple tests are run. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- This only affects calling pactest.py with multiple tests; `make check`, which runs each test in a separate instance, is unaffected. test/pacman/pmenv.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/pacman/pmenv.py b/test/pacman/pmenv.py index fa864fe..2d887b0 100644 --- a/test/pacman/pmenv.py +++ b/test/pacman/pmenv.py @@ -51,14 +51,14 @@ def addtest(self, testcase): """ if not os.path.isfile(testcase): raise IOError("test file %s not found" % testcase) - test = pmtest.pmtest(testcase, self.root) - self.testcases.append(test) + self.testcases.append(testcase) def run(self): """ """ tap.plan(len(self.testcases)) - for t in self.testcases: + for testcase in self.testcases: + t = pmtest.pmtest(testcase, self.root) tap.diag("Running '%s'" % t.testname) t.load() -- 2.0.2

1 0

[pacman-dev] [PATCH 02/11] pactest: only snapshot needed files
by Andrew Gregory 01 Aug '14

01 Aug '14

Only a few of our tests need file snapshots at all and most of them only need a few files. Taking snapshots of the entire test environment for every single test is a massive waste. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/pmrule.py | 6 ++++++ test/pacman/pmtest.py | 17 +++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index a91741b..0eec8ea 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -32,6 +32,12 @@ def __init__(self, rule): def __str__(self): return self.rule + def snapshots_needed(self): + (testname, args) = self.rule.split("=") + if testname == "FILE_MODIFIED" or testname == "!FILE_MODIFIED": + return [args] + return [] + def check(self, test): """ """ diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 7079b78..78b9e2d 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -183,12 +183,17 @@ def generate(self, pacman): # Done. vprint(" Taking a snapshot of the file system") - for roots, dirs, files in os.walk(self.root): - for i in files: - filename = os.path.join(roots, i) - f = pmfile.PacmanFile(self.root, filename.replace(self.root + "/", "")) - self.files.append(f) - vprint("\t%s" % f.name) + for filename in self.snapshots_needed(): + f = pmfile.PacmanFile(self.root, filename) + self.files.append(f) + vprint("\t%s" % f.name) + + + def snapshots_needed(self): + files = set() + for r in self.rules: + files.update(r.snapshots_needed()) + return files def run(self, pacman): if os.path.isfile(util.PM_LOCK): -- 2.0.2

1 0