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

[pacman-dev] [PATCH] Streamline alpm_splitdep() comparisons
by Dan McGee 29 Aug '11

29 Aug '11

This reduces from 5 to 3 the number of searches needed on the string looking for a comparison operator, since we can so a second quick comparison looking for '=' if we find '<' or '>'. It also makes every search doable with strchr() or memchr() rather than the slower strstr() method. In testing, only 10% of splitdep calls (~1600 / 16000) during an -Ss database load found a version comparison operator, so optimizing the not found path to be require less work makes sense. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/deps.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index e268157..639f14b 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -410,31 +410,37 @@ alpm_depend_t *_alpm_splitdep(const char *depstring) { alpm_depend_t *depend; const char *ptr, *version = NULL; + size_t deplen; if(depstring == NULL) { return NULL; } CALLOC(depend, 1, sizeof(alpm_depend_t), return NULL); + deplen = strlen(depstring); /* Find a version comparator if one exists. If it does, set the type and * increment the ptr accordingly so we can copy the right strings. */ - if((ptr = strstr(depstring, ">="))) { - depend->mod = ALPM_DEP_MOD_GE; - version = ptr + 2; - } else if((ptr = strstr(depstring, "<="))) { - depend->mod = ALPM_DEP_MOD_LE; - version = ptr + 2; - } else if((ptr = strstr(depstring, "="))) { + if((ptr = memchr(depstring, '<', deplen))) { + if(ptr[1] == '=') { + depend->mod = ALPM_DEP_MOD_LE; + version = ptr + 2; + } else { + depend->mod = ALPM_DEP_MOD_LT; + version = ptr + 1; + } + } else if((ptr = memchr(depstring, '>', deplen))) { + if(ptr[1] == '=') { + depend->mod = ALPM_DEP_MOD_GE; + version = ptr + 2; + } else { + depend->mod = ALPM_DEP_MOD_GT; + version = ptr + 1; + } + } else if((ptr = memchr(depstring, '=', deplen))) { /* Note: we must do =,<,> checks after <=, >= checks */ depend->mod = ALPM_DEP_MOD_EQ; version = ptr + 1; - } else if((ptr = strstr(depstring, "<"))) { - depend->mod = ALPM_DEP_MOD_LT; - version = ptr + 1; - } else if((ptr = strstr(depstring, ">"))) { - depend->mod = ALPM_DEP_MOD_GT; - version = ptr + 1; } else { /* no version specified, leave version and ptr NULL */ depend->mod = ALPM_DEP_MOD_ANY; -- 1.7.6.1

1 0

[pacman-dev] [PATCH] Run pacman test-suite with LC_ALL=C
by Allan McRae 29 Aug '11

29 Aug '11

Running the pacman test-suite in a non-English locale results in a few failures. Force the test-suite to run with LC_ALL=C. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Not sure if this is the best approach or whether we should just have the three tests that require it to run under the C locale. Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 75760bb..fb7a4d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ dist_pkgdata_DATA = \ # run the pactest test suite and vercmp tests check-local: test/pacman test/util src/pacman src/util - $(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \ + LC_ALL=C $(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \ --test $(top_srcdir)/test/pacman/tests/*.py \ -p $(top_builddir)/src/pacman/pacman $(SH) $(top_srcdir)/test/util/pacsorttest.sh \ -- 1.7.6.1

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-124-gf46db04
by dan＠archlinux.org 29 Aug '11

29 Aug '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 f46db04f98cb63b48208026865943e42e7ece2f4 (commit) via 8973875a1fc52ec35c255afd34c9cd7d5c285caa (commit) via b221af660d101301606e263cef73b358937516a6 (commit) via 040083b97fab61c8afc16a1c49a8384d097c272a (commit) via 3a458783a2617b7b22a756f95b5f66f3da79146f (commit) via 12a6c77fdd0c465761f4f9518eff0eeeda668d20 (commit) via 7ceeebf1505dba655b43e095f5392367a3a0f9b8 (commit) via e1b9f7b3005c4d6db9cc84e95a42d4beba6c7e24 (commit) via 29dede2eb76ab5a139d4e8236be1037a7a86b6e5 (commit) via cab1379a1ab14e29414c5fdf6252d1f5ea7263fb (commit) via 710e83999bbf8ae614b9310744c5306a7cbc858b (commit) via d1240f67eab6dfa7e3344cd84dd8849b38ce337c (commit) from 2cfcc874b9332ad207398b9e20dc8880d93e8ae4 (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 f46db04f98cb63b48208026865943e42e7ece2f4 Merge: 8973875 12a6c77 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Aug 28 23:51:05 2011 -0500 Merge branch 'allan/pacman-key' commit 8973875a1fc52ec35c255afd34c9cd7d5c285caa Author: Dan McGee <dan(a)archlinux.org> Date: Sun Aug 28 23:05:20 2011 -0500 _alpm_splitdep(): don't pass bogus length value to strndup If we fell through to the ALPM_DEP_MOD_ANY case, ptr would be NULL, and we would pass (0 - <str>), which is a rather large negative number or bogus positive number, depending on signed/unsigned. Just use strdup in the case where we don't have a ptr available. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b221af660d101301606e263cef73b358937516a6 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Aug 28 22:20:41 2011 -0500 Database read optimizations Hard to believe there was still more room to improve on this, but I found an easily correctable oversight tonight. Our databases (both sync and local) contain many blank lines, and we were not moving onto the next line right away in these cases; instead we would proceed through our strcmp() conditional checks as normal. Some local numbers follow to show the effects of this patch: Sync `-Ss foobarbaz`: 71,709 blank lines skipped early ~1,505,889 strcmp() calls avoided (21 per line) ~15% speed improvement (.210 --> .179 sec) Local `-Qs foobarbaz`: 6,823 blank lines skipped early 115,991 strcmp() calls avoided (17 per line) ~6% speed improvement (.080 -> .071 sec) Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 040083b97fab61c8afc16a1c49a8384d097c272a Author: Dan McGee <dan(a)archlinux.org> Date: Sun Aug 28 23:41:17 2011 -0500 Allow access to package origin data Add new alpm_pkg_get_origin() method, use it in the front end now that the enum constants are publicly available. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3a458783a2617b7b22a756f95b5f66f3da79146f Author: Diogo Sousa <diogogsousa(a)gmail.com> Date: Mon Aug 29 02:51:32 2011 +0100 Removed multiple definitions of pkgfrom_t libalpm now exports type alpm_pkgfrom_t in alpm.h, which may be used by frontends. Pacman now uses alpm_pkgfrom_t instead of replicating that type (pkg_from as was in src/pacman/package.h) Updated API change in README. Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 12a6c77fdd0c465761f4f9518eff0eeeda668d20 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 12:59:27 2011 -0500 pacman-key: have --init add more options to default gpg.conf This adds a add_gpg_conf_option() helper function which tries to be intelligent and only add not found options, and those which have not been explicitly commented out. The new options added are 'no-greeting', 'no-permission-warning', and a default 'keyserver'. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7ceeebf1505dba655b43e095f5392367a3a0f9b8 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 12:59:26 2011 -0500 pacman-key: refine permission and locking checks * secring.gpg can be 600, readable by root user only * ensure grep for lock-never option in check_keyring doesn't catch comments Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e1b9f7b3005c4d6db9cc84e95a42d4beba6c7e24 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 23 16:10:06 2011 +1000 pacman-key: rework and document holding keys in keyring The HoldKey option was undocumented and was not suited for pacman.conf. Instead use the file "/etc/pacman.d/gnupg/heldkeys" to contain a list of keys not to be removed from the pacman keyring with the --populate option. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 29dede2eb76ab5a139d4e8236be1037a7a86b6e5 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 23 15:46:46 2011 +1000 pacman-key: Improve documentation for --populate Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cab1379a1ab14e29414c5fdf6252d1f5ea7263fb Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 23 15:12:08 2011 +1000 pacman-key: update trust database for relevant operations After most operations that touch the keyring, it is a good idea to always run a check on the trustdb as this prevents gpg complaining on later operations. Inspiration-from: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 710e83999bbf8ae614b9310744c5306a7cbc858b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 23 15:00:19 2011 +1000 pacman-key: import everything then revoke on --populate The optimization of only importing keys that were not to be later revoked was a not smart enough. For example, if a key was in both a repos keyring and its revoke list, alternate runs of pacman-key --populate would add then remove the key from the pacman keyring. This problem is made worse when considering the possibility of multiple keyrings being imported. Instead, import all keys followed by the revoking of all keys. This may result in a key being added then revoked, but that is not much of an issue given that is a very fast operation. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d1240f67eab6dfa7e3344cd84dd8849b38ce337c Author: Allan McRae <allan(a)archlinux.org> Date: Mon Aug 15 22:51:58 2011 +1000 pacman-key: rework importing distro/repo provided keyrings The current --reload option, apart from being non-clear in its naming, is very limited in that only one keyring can be provided. A distribution may want to provide multiple keyrings for various subsets of its organisation or custom repo providers may also want to provide a keyring. This patch adds a --populate option that reads keyrings from (by default) /usr/share/pacman/keyrings. A keyring is named foo.gpg, with optional foo-revoked file providing a list of revoked key ids. These files are required to be signed (detached) by a key trusted by pacman-key, in practice probably by the key that signed the package providing these files. The --populate flag either updates the pacman keyring using all keyrings in the directory or individual keyrings can be specified. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 4 +- doc/pacman-key.8.txt | 23 +++++- lib/libalpm/alpm.h | 11 +++ lib/libalpm/be_local.c | 8 ++- lib/libalpm/be_sync.c | 5 +- lib/libalpm/deps.c | 6 +- lib/libalpm/package.c | 7 ++ lib/libalpm/package.h | 6 -- scripts/Makefile.am | 1 + scripts/pacman-key.sh.in | 223 ++++++++++++++++++++++++---------------------- src/pacman/package.c | 7 +- src/pacman/package.h | 9 +-- src/pacman/query.c | 4 +- src/pacman/sync.c | 4 +- 14 files changed, 183 insertions(+), 135 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Standardize output when db.lck is present
by pangyanhan＠gmail.com 29 Aug '11

29 Aug '11

From: Pang Yan Han <pangyanhan(a)gmail.com> When db.lck file is present, pacman -Syy and other Sync operations involving transactions show: :: Synchronizing package databases... error: failed to update core (unable to lock database) error: failed to update extra (unable to lock database) error: failed to update community (unable to lock database) error: failed to update multilib (unable to lock database) error: failed to synchronize any databases Whereas pacman -U <pkg> shows: error: failed to init transaction (unable to lock database) if you're sure a package manager is not already running, you can remove /var/lib/pacman/db.lck which is much more meaningful. Standardize the output to that of pacman -U when db.lck is present. Reported-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- src/pacman/sync.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index ea32a26..37f6ecb 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -288,6 +288,15 @@ static int sync_synctree(int level, alpm_list_t *syncs) ret = alpm_db_update((level < 2 ? 0 : 1), db); if(ret < 0) { + enum _alpm_errno_t err = alpm_errno(config->handle); + pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to init transaction (%s)\n"), + alpm_strerror(err)); + if(err == ALPM_ERR_HANDLE_LOCK) { + fprintf(stderr, _(" if you're sure a package manager is not already\n" + " running, you can remove %s\n"), + alpm_option_get_lockfile(config->handle)); + return 0; + } pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to update %s (%s)\n"), alpm_db_get_name(db), alpm_strerror(alpm_errno(config->handle))); } else if(ret == 1) { -- 1.7.6.1.385.gb7fcd0

2 1

[pacman-dev] [PATCH] Allow access to package origin data
by Dan McGee 29 Aug '11

29 Aug '11

Add new alpm_pkg_get_origin() method, use it in the front end now that the enum constants are publicly available. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- README | 2 +- lib/libalpm/alpm.h | 5 +++++ lib/libalpm/package.c | 7 +++++++ src/pacman/package.c | 7 +++---- src/pacman/package.h | 2 +- src/pacman/query.c | 4 ++-- src/pacman/sync.c | 4 ++-- 7 files changed, 21 insertions(+), 10 deletions(-) diff --git a/README b/README index fbd40d2..c14fd3c 100644 --- a/README +++ b/README @@ -429,7 +429,7 @@ API CHANGES BETWEEN 3.5 AND 4.0 alpm_option_get_default_siglevel(), alpm_option_set_default_siglevel(), alpm_option_get_gpgdir(), alpm_option_set_gpgdir(), alpm_db_get_siglevel(), alpm_sigresult_cleanup(), alpm_db_check_pgp_signature(), alpm_pkg_check_pgp_signature(), - alpm_pkg_get_sha256sum(), alpm_pkg_get_base64_sig() + alpm_pkg_get_origin(), alpm_pkg_get_sha256sum(), alpm_pkg_get_base64_sig() - list functions: alpm_list_to_array(), alpm_list_previous() - structs: diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2f62565..42e6038 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -598,6 +598,11 @@ const char *alpm_pkg_get_name(alpm_pkg_t *pkg); */ const char *alpm_pkg_get_version(alpm_pkg_t *pkg); +/** Returns the origin of the package. + * @return a #alpm_pkgfrom_t constant, -1 on error + */ +alpm_pkgfrom_t alpm_pkg_get_origin(alpm_pkg_t *pkg); + /** Returns the package description. * @param pkg a pointer to package * @return a reference to an internal string diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 3d73a43..487b56d 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -185,6 +185,13 @@ const char SYMEXPORT *alpm_pkg_get_version(alpm_pkg_t *pkg) return pkg->version; } +alpm_pkgfrom_t SYMEXPORT alpm_pkg_get_origin(alpm_pkg_t *pkg) +{ + ASSERT(pkg != NULL, return -1); + pkg->handle->pm_errno = 0; + return pkg->origin; +} + const char SYMEXPORT *alpm_pkg_get_desc(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); diff --git a/src/pacman/package.c b/src/pacman/package.c index f7065d5..5654944 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -61,7 +61,7 @@ static void deplist_display(const char *title, * @param from the type of package we are dealing with * @param extra should we show extra information */ -void dump_pkg_full(alpm_pkg_t *pkg, alpm_pkgfrom_t from, int extra) +void dump_pkg_full(alpm_pkg_t *pkg, int extra) { const char *reason; time_t bdate, idate; @@ -69,10 +69,9 @@ void dump_pkg_full(alpm_pkg_t *pkg, alpm_pkgfrom_t from, int extra) const char *label; double size; alpm_list_t *requiredby = NULL; + alpm_pkgfrom_t from; - if(pkg == NULL) { - return; - } + from = alpm_pkg_get_origin(pkg); /* set variables here, do all output below */ bdate = alpm_pkg_get_builddate(pkg); diff --git a/src/pacman/package.h b/src/pacman/package.h index 4bbc2ba..890b4fe 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -22,7 +22,7 @@ #include <alpm.h> -void dump_pkg_full(alpm_pkg_t *pkg, alpm_pkgfrom_t from, int extra); +void dump_pkg_full(alpm_pkg_t *pkg, int extra); void dump_pkg_backups(alpm_pkg_t *pkg); void dump_pkg_files(alpm_pkg_t *pkg, int quiet); diff --git a/src/pacman/query.c b/src/pacman/query.c index ec98c99..5f2b37e 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -460,9 +460,9 @@ static int display(alpm_pkg_t *pkg) if(config->op_q_info) { if(config->op_q_isfile) { - dump_pkg_full(pkg, PKG_FROM_FILE, 0); + dump_pkg_full(pkg, 0); } else { - dump_pkg_full(pkg, PKG_FROM_LOCALDB, config->op_q_info > 1); + dump_pkg_full(pkg, config->op_q_info > 1); } } if(config->op_q_list) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index a7fe5be..e97da37 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -469,7 +469,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) alpm_pkg_t *pkg = alpm_list_getdata(k); if(strcmp(alpm_pkg_get_name(pkg), pkgstr) == 0) { - dump_pkg_full(pkg, PKG_FROM_SYNCDB, config->op_s_info > 1); + dump_pkg_full(pkg, config->op_s_info > 1); foundpkg = 1; break; } @@ -494,7 +494,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) for(j = alpm_db_get_pkgcache(db); j; j = alpm_list_next(j)) { alpm_pkg_t *pkg = alpm_list_getdata(j); - dump_pkg_full(pkg, PKG_FROM_SYNCDB, config->op_s_info > 1); + dump_pkg_full(pkg, config->op_s_info > 1); } } } -- 1.7.6

1 0

[pacman-dev] [PATCH] Removed multiple definitions of pkgfrom_t
by Diogo Sousa 29 Aug '11

29 Aug '11

libalpm now exports type alpm_pkgfrom_t in alpm.h, which may be used by frontends. Pacman now uses alpm_pkgfrom_t instead of replicating that type (pkg_from as was in src/pacman/package.h) Updated API change in README. Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> --- README | 2 +- lib/libalpm/alpm.h | 6 ++++++ lib/libalpm/package.h | 6 ------ src/pacman/package.c | 2 +- src/pacman/package.h | 9 +-------- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/README b/README index d5071a9..fbd40d2 100644 --- a/README +++ b/README @@ -435,7 +435,7 @@ API CHANGES BETWEEN 3.5 AND 4.0 - structs: alpm_backup_t, alpm_file_t, alpm_filelist_t - enums: - alpm_siglevel_t, alpm_sigstatus_t, alpm_sigvalidity_t + alpm_siglevel_t, alpm_sigstatus_t, alpm_sigvalidity_t, alpm_pkgfrom_t - error codes: ALPM_ERR_DB_INVALID, ALPM_ERR_DB_INVALID_SIG, ALPM_ERR_GPGME, ALPM_ERR_PKG_INVALID_CHECKSUM, ALPM_ERR_PKG_INVALID_SIG, ALPM_ERR_SIG_INVALID, diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c94cdf7..2f62565 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -60,6 +60,12 @@ typedef enum _alpm_pkgreason_t { ALPM_PKG_REASON_DEPEND = 1 } alpm_pkgreason_t; +typedef enum _alpm_pkgfrom_t { + PKG_FROM_FILE = 1, + PKG_FROM_LOCALDB, + PKG_FROM_SYNCDB +} alpm_pkgfrom_t; + /** Types of version constraints in dependency specs. */ typedef enum _alpm_depmod_t { /** No version constraint */ diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 707405d..5962b1d 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -34,12 +34,6 @@ #include "db.h" #include "signing.h" -typedef enum _alpm_pkgfrom_t { - PKG_FROM_FILE = 1, - PKG_FROM_LOCALDB, - PKG_FROM_SYNCDB -} alpm_pkgfrom_t; - /** Package operations struct. This struct contains function pointers to * all methods used to access data in a package to allow for things such * as lazy package intialization (such as used by the file backend). Each diff --git a/src/pacman/package.c b/src/pacman/package.c index a8c15eb..f7065d5 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -61,7 +61,7 @@ static void deplist_display(const char *title, * @param from the type of package we are dealing with * @param extra should we show extra information */ -void dump_pkg_full(alpm_pkg_t *pkg, enum pkg_from from, int extra) +void dump_pkg_full(alpm_pkg_t *pkg, alpm_pkgfrom_t from, int extra) { const char *reason; time_t bdate, idate; diff --git a/src/pacman/package.h b/src/pacman/package.h index 6f71d20..4bbc2ba 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -22,14 +22,7 @@ #include <alpm.h> -/* TODO it would be nice if we didn't duplicate a backend type */ -enum pkg_from { - PKG_FROM_FILE = 1, - PKG_FROM_LOCALDB, - PKG_FROM_SYNCDB -}; - -void dump_pkg_full(alpm_pkg_t *pkg, enum pkg_from from, int extra); +void dump_pkg_full(alpm_pkg_t *pkg, alpm_pkgfrom_t from, int extra); void dump_pkg_backups(alpm_pkg_t *pkg); void dump_pkg_files(alpm_pkg_t *pkg, int quiet); -- 1.7.6.1

2 1

[pacman-dev] [PATCH] _alpm_splitdep(): don't pass bogus length value to strndup
by Dan McGee 29 Aug '11

29 Aug '11

If we fell through to the ALPM_DEP_MOD_ANY case, ptr would be NULL, and we would pass (0 - <str>), which is a rather large negative number or bogus positive number, depending on signed/unsigned. Just use strdup in the case where we don't have a ptr available. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/deps.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 47b7637..e268157 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -441,7 +441,11 @@ alpm_depend_t *_alpm_splitdep(const char *depstring) } /* copy the right parts to the right places */ - STRNDUP(depend->name, depstring, ptr - depstring, return NULL); + if(ptr) { + STRNDUP(depend->name, depstring, ptr - depstring, return NULL); + } else { + STRDUP(depend->name, depstring, return NULL); + } depend->name_hash = _alpm_hash_sdbm(depend->name); if(version) { STRDUP(depend->version, version, return NULL); -- 1.7.6

1 0

[pacman-dev] [PATCH] Database read optimizations
by Dan McGee 29 Aug '11

29 Aug '11

Hard to believe there was still more room to improve on this, but I found an easily correctable oversight tonight. Our databases (both sync and local) contain many blank lines, and we were not moving onto the next line right away in these cases; instead we would proceed through our strcmp() conditional checks as normal. Some local numbers follow to show the effects of this patch: Sync `-Ss foobarbaz`: 71,709 blank lines skipped early ~1,505,889 strcmp() calls avoided (21 per line) ~15% speed improvement (.210 --> .179 sec) Local `-Qs foobarbaz`: 6,823 blank lines skipped early 115,991 strcmp() calls avoided (17 per line) ~6% speed improvement (.080 -> .071 sec) Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 8 +++++++- lib/libalpm/be_sync.c | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 1a46dfd..be02bb5 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -580,7 +580,13 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) goto error; } while(!feof(fp)) { - READ_NEXT(); + if(fgets(line, sizeof(line), fp) == NULL && !feof(fp)) { + goto error; + } + if(_alpm_strip_newline(line) == 0) { + /* length of stripped line was zero */ + continue; + } if(strcmp(line, "%NAME%") == 0) { READ_NEXT(); if(strcmp(line, info->name) != 0) { diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index ac99e05..12d5b7f 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -526,7 +526,10 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, int ret; while((ret = _alpm_archive_fgets(archive, &buf)) == ARCHIVE_OK) { char *line = buf.line; - _alpm_strip_newline(line); + if(_alpm_strip_newline(line) == 0) { + /* length of stripped line was zero */ + continue; + } if(strcmp(line, "%NAME%") == 0) { READ_NEXT(); -- 1.7.6

1 0

[pacman-dev] [PATCH] Removed multiple definitions of pkgfrom_t
by Diogo Sousa 29 Aug '11

29 Aug '11

libalpm now exports type alpm_pkgfrom_t in alpm.h, which may be used by frontends. Pacman now uses alpm_pkgfrom_t instead of replicating that type (pkg_from as was in src/pacman/package.h) Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> --- lib/libalpm/alpm.h | 6 ++++++ lib/libalpm/package.h | 6 ------ src/pacman/package.c | 2 +- src/pacman/package.h | 9 +-------- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index fc8f0bc..b1e9a88 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -197,6 +197,12 @@ typedef struct _alpm_file_t { mode_t mode; } alpm_file_t; +typedef enum _alpm_pkgfrom_t { + PKG_FROM_FILE = 1, + PKG_FROM_LOCALDB, + PKG_FROM_SYNCDB +} alpm_pkgfrom_t; + /** Package filelist container */ typedef struct _alpm_filelist_t { size_t count; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 25d1b1a..a75f6ae 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -34,12 +34,6 @@ #include "db.h" #include "signing.h" -typedef enum _alpm_pkgfrom_t { - PKG_FROM_FILE = 1, - PKG_FROM_LOCALDB, - PKG_FROM_SYNCDB -} alpm_pkgfrom_t; - /** Package operations struct. This struct contains function pointers to * all methods used to access data in a package to allow for things such * as lazy package intialization (such as used by the file backend). Each diff --git a/src/pacman/package.c b/src/pacman/package.c index 80c6bf2..ef483ef 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -61,7 +61,7 @@ static void deplist_display(const char *title, * @param from the type of package we are dealing with * @param extra should we show extra information */ -void dump_pkg_full(alpm_pkg_t *pkg, enum pkg_from from, int extra) +void dump_pkg_full(alpm_pkg_t *pkg, alpm_pkgfrom_t from, int extra) { const char *reason; time_t bdate, idate; diff --git a/src/pacman/package.h b/src/pacman/package.h index 6f71d20..4bbc2ba 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -22,14 +22,7 @@ #include <alpm.h> -/* TODO it would be nice if we didn't duplicate a backend type */ -enum pkg_from { - PKG_FROM_FILE = 1, - PKG_FROM_LOCALDB, - PKG_FROM_SYNCDB -}; - -void dump_pkg_full(alpm_pkg_t *pkg, enum pkg_from from, int extra); +void dump_pkg_full(alpm_pkg_t *pkg, alpm_pkgfrom_t from, int extra); void dump_pkg_backups(alpm_pkg_t *pkg); void dump_pkg_files(alpm_pkg_t *pkg, int quiet); -- 1.7.6.1

3 3

[pacman-dev] [PATCH 1/3] lib/libalpm/signing.c: Fix memory leak in decode_signature() in case of error.
by Diogo Sousa 29 Aug '11

29 Aug '11

Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> --- lib/libalpm/signing.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 8db4a7b..67f7adf 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -175,6 +175,7 @@ static int decode_signature(const char *base64_data, size_t destlen = len * 3 / 4; MALLOC(*data, destlen, goto error); if(base64_decode(*data, &destlen, usline, len)) { + free(*data); goto error; } *data_len = destlen; -- 1.7.6.1

2 4