- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 01/11] handle: factor out string list option handling
by Andrew Gregory 03 Aug '14

03 Aug '14

Consolidates repeated code and replaces dangerous strdup calls with STRDUP. Also fix a couple variables named "pkg" that refer to file paths. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/alpm.h | 8 ++--- lib/libalpm/handle.c | 89 +++++++++++++++++++++------------------------------- 2 files changed, 39 insertions(+), 58 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index db1e0cd..29a2dda 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -818,9 +818,9 @@ int alpm_option_set_usesyslog(alpm_handle_t *handle, int usesyslog); * @{ */ alpm_list_t *alpm_option_get_noupgrades(alpm_handle_t *handle); -int alpm_option_add_noupgrade(alpm_handle_t *handle, const char *pkg); +int alpm_option_add_noupgrade(alpm_handle_t *handle, const char *path); int alpm_option_set_noupgrades(alpm_handle_t *handle, alpm_list_t *noupgrade); -int alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *pkg); +int alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *path); /** @} */ /** @name Accessors to the list of no-extract files. @@ -830,9 +830,9 @@ int alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *pkg); * @{ */ alpm_list_t *alpm_option_get_noextracts(alpm_handle_t *handle); -int alpm_option_add_noextract(alpm_handle_t *handle, const char *pkg); +int alpm_option_add_noextract(alpm_handle_t *handle, const char *path); int alpm_option_set_noextracts(alpm_handle_t *handle, alpm_list_t *noextract); -int alpm_option_remove_noextract(alpm_handle_t *handle, const char *pkg); +int alpm_option_remove_noextract(alpm_handle_t *handle, const char *path); /** @} */ /** @name Accessors to the list of ignored packages. diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 0842d51..b218a68 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -444,26 +444,28 @@ int SYMEXPORT alpm_option_set_usesyslog(alpm_handle_t *handle, int usesyslog) return 0; } -int SYMEXPORT alpm_option_add_noupgrade(alpm_handle_t *handle, const char *pkg) +static int _alpm_option_strlist_add(alpm_handle_t *handle, alpm_list_t **list, const char *str) { + char *dup; CHECK_HANDLE(handle, return -1); - handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(pkg)); + STRDUP(dup, str, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + *list = alpm_list_add(*list, dup); return 0; } -int SYMEXPORT alpm_option_set_noupgrades(alpm_handle_t *handle, alpm_list_t *noupgrade) +static int _alpm_option_strlist_set(alpm_handle_t *handle, alpm_list_t **list, alpm_list_t *newlist) { CHECK_HANDLE(handle, return -1); - if(handle->noupgrade) FREELIST(handle->noupgrade); - handle->noupgrade = alpm_list_strdup(noupgrade); + FREELIST(*list); + *list = alpm_list_strdup(newlist); return 0; } -int SYMEXPORT alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *pkg) +static int _alpm_option_strlist_rem(alpm_handle_t *handle, alpm_list_t **list, const char *str) { char *vdata = NULL; CHECK_HANDLE(handle, return -1); - handle->noupgrade = alpm_list_remove_str(handle->noupgrade, pkg, &vdata); + *list = alpm_list_remove_str(*list, str, &vdata); if(vdata != NULL) { FREE(vdata); return 1; @@ -471,85 +473,64 @@ int SYMEXPORT alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *pk return 0; } -int SYMEXPORT alpm_option_add_noextract(alpm_handle_t *handle, const char *pkg) +int SYMEXPORT alpm_option_add_noupgrade(alpm_handle_t *handle, const char *pkg) { - CHECK_HANDLE(handle, return -1); - handle->noextract = alpm_list_add(handle->noextract, strdup(pkg)); - return 0; + return _alpm_option_strlist_add(handle, &(handle->noupgrade), pkg); +} + +int SYMEXPORT alpm_option_set_noupgrades(alpm_handle_t *handle, alpm_list_t *noupgrade) +{ + return _alpm_option_strlist_set(handle, &(handle->noupgrade), noupgrade); +} + +int SYMEXPORT alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *pkg) +{ + return _alpm_option_strlist_rem(handle, &(handle->noupgrade), pkg); +} + +int SYMEXPORT alpm_option_add_noextract(alpm_handle_t *handle, const char *path) +{ + return _alpm_option_strlist_add(handle, &(handle->noextract), path); } int SYMEXPORT alpm_option_set_noextracts(alpm_handle_t *handle, alpm_list_t *noextract) { - CHECK_HANDLE(handle, return -1); - if(handle->noextract) FREELIST(handle->noextract); - handle->noextract = alpm_list_strdup(noextract); - return 0; + return _alpm_option_strlist_set(handle, &(handle->noextract), noextract); } -int SYMEXPORT alpm_option_remove_noextract(alpm_handle_t *handle, const char *pkg) +int SYMEXPORT alpm_option_remove_noextract(alpm_handle_t *handle, const char *path) { - char *vdata = NULL; - CHECK_HANDLE(handle, return -1); - handle->noextract = alpm_list_remove_str(handle->noextract, pkg, &vdata); - if(vdata != NULL) { - FREE(vdata); - return 1; - } - return 0; + return _alpm_option_strlist_rem(handle, &(handle->noextract), path); } int SYMEXPORT alpm_option_add_ignorepkg(alpm_handle_t *handle, const char *pkg) { - CHECK_HANDLE(handle, return -1); - handle->ignorepkg = alpm_list_add(handle->ignorepkg, strdup(pkg)); - return 0; + return _alpm_option_strlist_add(handle, &(handle->ignorepkg), pkg); } int SYMEXPORT alpm_option_set_ignorepkgs(alpm_handle_t *handle, alpm_list_t *ignorepkgs) { - CHECK_HANDLE(handle, return -1); - if(handle->ignorepkg) FREELIST(handle->ignorepkg); - handle->ignorepkg = alpm_list_strdup(ignorepkgs); - return 0; + return _alpm_option_strlist_set(handle, &(handle->ignorepkg), ignorepkgs); } int SYMEXPORT alpm_option_remove_ignorepkg(alpm_handle_t *handle, const char *pkg) { - char *vdata = NULL; - CHECK_HANDLE(handle, return -1); - handle->ignorepkg = alpm_list_remove_str(handle->ignorepkg, pkg, &vdata); - if(vdata != NULL) { - FREE(vdata); - return 1; - } - return 0; + return _alpm_option_strlist_rem(handle, &(handle->ignorepkg), pkg); } int SYMEXPORT alpm_option_add_ignoregroup(alpm_handle_t *handle, const char *grp) { - CHECK_HANDLE(handle, return -1); - handle->ignoregroup = alpm_list_add(handle->ignoregroup, strdup(grp)); - return 0; + return _alpm_option_strlist_add(handle, &(handle->ignoregroup), grp); } int SYMEXPORT alpm_option_set_ignoregroups(alpm_handle_t *handle, alpm_list_t *ignoregrps) { - CHECK_HANDLE(handle, return -1); - if(handle->ignoregroup) FREELIST(handle->ignoregroup); - handle->ignoregroup = alpm_list_strdup(ignoregrps); - return 0; + return _alpm_option_strlist_set(handle, &(handle->ignoregroup), ignoregrps); } int SYMEXPORT alpm_option_remove_ignoregroup(alpm_handle_t *handle, const char *grp) { - char *vdata = NULL; - CHECK_HANDLE(handle, return -1); - handle->ignoregroup = alpm_list_remove_str(handle->ignoregroup, grp, &vdata); - if(vdata != NULL) { - FREE(vdata); - return 1; - } - return 0; + return _alpm_option_strlist_rem(handle, &(handle->ignoregroup), grp); } int SYMEXPORT alpm_option_set_arch(alpm_handle_t *handle, const char *arch) -- 2.0.2

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-379-gfbb0945
by allan＠archlinux.org 03 Aug '14

03 Aug '14

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 fbb0945bfb6a9535dc42a120466b44c0b39c915d (commit) via 9506409c3fa5e5df3a70ba9b814ce0032ed24196 (commit) via 71da296d01ee564d39012415d7e1981c42723648 (commit) via c3835c157a870de8f4ac554f6d72e78e49c4e46b (commit) via bbeced26f6ce167ad93817ebe7180cd22ef33c86 (commit) via e8de265f8039165dc32ffb78f6a6a5eb0c1514ad (commit) via 0e2db97a42df30d2731e4842b245191a68817d78 (commit) via 79548e0d78843dbf2266658c99cae6dafb643130 (commit) via 73717f89df6ebf3c03f00a70ca2728c04cebe7a0 (commit) via 6650c43fcafd144c78349aca9eb80c0ae3886a9d (commit) via 0c5e80c3b42b2fc02e8b800bada7f6bb30a56578 (commit) via 80eca94c8eec7dfeda02eff437309c4e20931afd (commit) via 0e18cefe3857b35b90fa1bfb2c5edb7dd8ad2866 (commit) via 300dd62e0a690f217da7593f28312ab022f4c0ad (commit) via 7305768d5436823999eff382de6bc6334f4e66a4 (commit) via e0a7682607256ef24b5d2d58212c4b958cce0dce (commit) via e05fd5e060cf5a4a71d5d8a65db7b39876d67726 (commit) via 357b9a24a96478b7bcaaea8633f8f6a519f8903c (commit) via 07647d3d43d418f9efcf7c83a2079b9b673a7bfa (commit) from fa0c1e1419b4a73b4a522bc6f4117b8bf337eabe (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 fbb0945bfb6a9535dc42a120466b44c0b39c915d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 25 14:09:06 2014 -0400 makepkg: improve check and error message for buildfile location The documentation very clearly states that the buildfile has to be in $PWD, but the error thrown by makepkg reference some mysterious "build directory". Simplify this check so that we more directly check that the file being referred to is in fact in our $PWD. Revise the error message when the check fails to more plainly point out the problem. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9506409c3fa5e5df3a70ba9b814ce0032ed24196 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Mar 24 09:59:44 2014 -0400 sync_prepare: remove useless check for replacers Since 017184fa, alpm_sync_sysupgrade will not add both a replacement and a literal upgrade to the transaction. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 71da296d01ee564d39012415d7e1981c42723648 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jun 26 12:19:09 2014 -0400 check_pkg_fast: check file type Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit c3835c157a870de8f4ac554f6d72e78e49c4e46b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jun 26 12:12:00 2014 -0400 check_file_exists: replace lstat with llstat Paths are constructed directly from package file lists and may contain trailing slashes, causing lstat to dereference symlinks. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit bbeced26f6ce167ad93817ebe7180cd22ef33c86 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jun 26 11:52:05 2014 -0400 llstat: modify path in place This makes llstat's signature differ from lstat's, but we never actually use it on a const string and this saves a large number of strdup's. This also allows stripping multiple trailing slashes and corrects a bug where calling llstat on "/" would result in calling lstat on an empty string. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit e8de265f8039165dc32ffb78f6a6a5eb0c1514ad Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jun 26 11:50:34 2014 -0400 move _alpm_lstat into util-common Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 0e2db97a42df30d2731e4842b245191a68817d78 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jun 26 12:33:33 2014 -0400 add test for file type check with -Qk If a directory has been replaced by a symlink, -Qk currently stats the symlink target rather than the symlink itself and doesn't check that the actual file type matches the package file list. This will make it difficult to discover errors once 4.2 is released and replacing directories with symlinks is no longer supported. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 79548e0d78843dbf2266658c99cae6dafb643130 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 29 17:55:06 2014 +1000 pacdiff: allow DIFFPROG to contain commandline options Also use 'vim -d' as default diff viewer. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 73717f89df6ebf3c03f00a70ca2728c04cebe7a0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jul 4 17:02:06 2014 -0400 pactest: check for tests before environment setup Setting up the temporary directory and environment is pointless if there are no tests to run. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 6650c43fcafd144c78349aca9eb80c0ae3886a9d Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jul 4 16:49:52 2014 -0400 pactest: check for pacman binary before running Using fakeroot or fakechroot as the command with subprocess.call prevents the detection and reporting of a missing pacman binary. Some tests even pass when run with a non-existent binary. Checking manually allows us to provide a meaningful error message and prevent the false positives. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 0c5e80c3b42b2fc02e8b800bada7f6bb30a56578 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jul 4 16:47:14 2014 -0400 pactest: parse options before environment setup Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 80eca94c8eec7dfeda02eff437309c4e20931afd Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Wed Jul 2 17:04:13 2014 +0200 makepkg: Respect XDG_CONFIG_HOME Add support for following the XDG Base Directory Specification when reading the user-specific configuration file. If no $XDG_CONFIG_HOME/pacman/makepkg.conf file exists we fall back to sourcing $HOME/.makepkg.conf Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> [Allan] Note XDG_CONFIG_HOME takes priority. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0e18cefe3857b35b90fa1bfb2c5edb7dd8ad2866 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Jul 9 22:47:50 2014 -0400 filelist_intersection: manually compare paths Prevents the need to modify paths, removing strndup as an unchecked point of failure, and lengths only need to be calculated if the paths match. Also removed an old comment regarding directory/symlink compatibility. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 300dd62e0a690f217da7593f28312ab022f4c0ad Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 29 17:21:55 2014 +1000 Add validpgpkeys to PKGBUILD prototypes. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7305768d5436823999eff382de6bc6334f4e66a4 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 29 17:13:42 2014 +1000 makepkg: handle "epoch=" in PKGBUILD with pkgver function After resourcing the PKGBUILD in update_pkgver(), set the epoch to 0 if it is empty. Also adjust the get_full_version function to be more robust if epoch somehow still is empty. Fixes FS#41022. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e0a7682607256ef24b5d2d58212c4b958cce0dce Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Jun 28 13:41:39 2014 -0400 use monotonic clock for progress updates gettimeofday is susceptible to backwards system time adjustments, skewing or altogether breaking progress output. For the sake of platforms that lack clock_gettime support, gettimeofday is retained as a fallback. Fixes FS#36983 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e05fd5e060cf5a4a71d5d8a65db7b39876d67726 Author: Christian Hesse <mail(a)eworm.de> Date: Tue Jun 24 09:38:19 2014 +0200 libalpm: check for valid public key algorithm commit 357b9a24a96478b7bcaaea8633f8f6a519f8903c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jun 21 08:44:01 2014 -0400 cache terminal size, add SIGWINCH handler to reset Refactoring getcols, yet again. We do the following: 1) Introduce a static global in src/pacman/util.c 2) getcols always prefers this cached value, but will derive it from the COLUMNS environment var, the characteristics of stdout, or a sane default (in that order). 3) Introduce a SIGWINCH signal handler to reset the cached value, meaning we only call ioctl when we don't know the value. On my machine, pacman -Syy goes from ~4300 ioctl calls to 3. commit 07647d3d43d418f9efcf7c83a2079b9b673a7bfa Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 29 10:39:14 2014 +1000 Revert refactoring in fa0c1e14 This will cause the code to break as soon as we handle another signal such as SIGWINCH... Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacdiff.sh.in | 6 +-- doc/makepkg.conf.5.txt | 5 +- lib/libalpm/add.c | 4 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/filelist.c | 56 +++++++++------------- lib/libalpm/remove.c | 2 +- lib/libalpm/signing.c | 12 +++++ lib/libalpm/sync.c | 2 - lib/libalpm/util.c | 25 ---------- lib/libalpm/util.h | 2 - proto/PKGBUILD-split.proto | 1 + proto/PKGBUILD.proto | 1 + scripts/makepkg.sh.in | 26 +++++++---- src/common/util-common.c | 29 ++++++++++++ src/common/util-common.h | 4 ++ src/pacman/callback.c | 64 ++++++++++++++------------ src/pacman/check.c | 21 +++++++-- src/pacman/package.c | 4 +- src/pacman/pacman.c | 7 ++- src/pacman/util.c | 60 ++++++++++++++++++------ src/pacman/util.h | 3 +- test/pacman/pactest.py | 23 +++++---- test/pacman/tests/TESTS | 1 + test/pacman/tests/querycheck_fast_file_type.py | 12 +++++ 25 files changed, 227 insertions(+), 147 deletions(-) create mode 100644 test/pacman/tests/querycheck_fast_file_type.py hooks/post-receive -- The official pacman repository

1 0

[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