- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Convert strtrim/strlen paired calls to only strtrim
by Dan McGee 23 Dec '11

23 Dec '11

This utilizes the new return value so we don't have to find the length of the string again. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/conf.c | 3 +-- src/pacman/util.c | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 117aecd4..7ba2791 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -726,8 +726,7 @@ static int _parseconfig(const char *file, struct section_t *section, *ptr = '\0'; } - strtrim(line); - line_len = strlen(line); + line_len = strtrim(line); if(line_len == 0) { continue; diff --git a/src/pacman/util.c b/src/pacman/util.c index 4160c44..467bedf 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1228,14 +1228,14 @@ static int multiselect_parse(char *array, int count, char *response) for(str = response; ; str = NULL) { int include = 1; int start, end; + size_t len; char *ends = NULL; char *starts = strtok_r(str, " ", &saveptr); if(starts == NULL) { break; } - strtrim(starts); - int len = strlen(starts); + len = strtrim(starts); if(len == 0) continue; @@ -1314,6 +1314,7 @@ int multiselect_question(char *array, int count) if(fgets(response, response_len, stdin)) { const size_t response_incr = 64; + size_t len; /* handle buffer not being large enough to read full line case */ while(*lastchar == '\0' && lastchar[-1] != '\n') { response_len += response_incr; @@ -1330,8 +1331,9 @@ int multiselect_question(char *array, int count) return -1; } } - strtrim(response); - if(strlen(response) > 0) { + + len = strtrim(response); + if(len > 0) { if(multiselect_parse(array, count, response) == -1) { /* only loop if user gave an invalid answer */ continue; @@ -1374,8 +1376,8 @@ int select_question(int count) flush_term_input(); if(fgets(response, sizeof(response), stdin)) { - strtrim(response); - if(strlen(response) > 0) { + size_t len = strtrim(response); + if(len > 0) { int n; if(parseindex(response, &n, 1, count) != 0) continue; @@ -1423,8 +1425,8 @@ static int question(short preset, char *fmt, va_list args) flush_term_input(); if(fgets(response, sizeof(response), stdin)) { - strtrim(response); - if(strlen(response) == 0) { + size_t len = strtrim(response); + if(len == 0) { return preset; } -- 1.7.8.1

1 0

[pacman-dev] [PATCH] pacman-key: Add some variable quotes and fix vim modeline for securemodelines
by Timothy Redaelli 23 Dec '11

23 Dec '11

From: Timothy Redaelli <timothy.redaelli(a)gmail.com> Signed-off-by: Timothy Redaelli <timothy.redaelli(a)gmail.com> --- scripts/pacman-key.sh.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index e0f48f5..c033da4 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -450,9 +450,9 @@ fi # file, falling back on a hard default PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(get_from "$CONFIG" "GPGDir" "@sysconfdir@/pacman.d/gnupg")} -GPG_PACMAN=(gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning) +GPG_PACMAN=(gpg --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning) if [[ -n ${KEYSERVER} ]]; then - GPG_PACMAN+=(--keyserver ${KEYSERVER}) + GPG_PACMAN+=(--keyserver "${KEYSERVER}") fi # check only a single operation has been given @@ -492,11 +492,11 @@ fi (( POPULATE )) && populate_keyring (( RECEIVE )) && "${GPG_PACMAN[@]}" --recv-keys "${KEYIDS[@]}" (( REFRESH )) && "${GPG_PACMAN[@]}" --refresh-keys "${KEYIDS[@]}" -(( VERIFY )) && "${GPG_PACMAN[@]}" --verify $SIGNATURE +(( VERIFY )) && "${GPG_PACMAN[@]}" --verify "$SIGNATURE" if (( UPDATEDB )); then msg "$(gettext "Updating trust database...")" "${GPG_PACMAN[@]}" --batch --check-trustdb fi -# vim: set ts=2 sw=2 noet: +# vim: set ts=2 sw=2 noet -- 1.7.8.1

3 3

[pacman-dev] [PATCH] Rework package removal code
by Dan McGee 23 Dec '11

23 Dec '11

Extract the actual unlinking of files into a new method, which eliminates a goto used for flow control. Also fix up a few small issues in the code: * Unnecessary (unsigned long) cast, use '%zd' instead * Total up errors returned from unlink_file calls and return to caller * Be consistent with scriptlets- we run pre_remove on dbonly, so we should also run post_remove. Both can be disabled by way of the --noscriptlet argument. * Don't pass an invalid pointer to oldpkg to the event callbacks; instead call the callback before we free the object. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/remove.c | 99 +++++++++++++++++++++++++++----------------------- 1 files changed, 54 insertions(+), 45 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 8967eff..b43d1a6 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -354,38 +354,15 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, return 0; } -int _alpm_remove_single_package(alpm_handle_t *handle, +static int remove_package_files(alpm_handle_t *handle, alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg, size_t targ_count, size_t pkg_count) { alpm_list_t *skip_remove; - size_t filenum = 0, position = 0; - const char *pkgname = oldpkg->name; - const char *pkgver = oldpkg->version; alpm_filelist_t *filelist; - size_t i; - - if(newpkg) { - _alpm_log(handle, ALPM_LOG_DEBUG, "removing old package first (%s-%s)\n", - pkgname, pkgver); - } else { - EVENT(handle, ALPM_EVENT_REMOVE_START, oldpkg, NULL); - _alpm_log(handle, ALPM_LOG_DEBUG, "removing package %s-%s\n", - pkgname, pkgver); - - /* run the pre-remove scriptlet if it exists */ - if(alpm_pkg_has_scriptlet(oldpkg) && - !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - char *scriptlet = _alpm_local_db_pkgpath(handle->db_local, - oldpkg, "install"); - _alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL, 0); - free(scriptlet); - } - } - - if(handle->trans->flags & ALPM_TRANS_FLAG_DBONLY) { - goto db; - } + size_t i, filenum = 0, position = 0; + int err = 0; + int nosave = handle->trans->flags & ALPM_TRANS_FLAG_NOSAVE; if(newpkg) { alpm_filelist_t *newfiles; @@ -416,32 +393,33 @@ int _alpm_remove_single_package(alpm_handle_t *handle, alpm_file_t *file = filelist->files + i; if(!can_remove_file(handle, file, skip_remove)) { _alpm_log(handle, ALPM_LOG_DEBUG, - "not removing package '%s', can't remove all files\n", pkgname); + "not removing package '%s', can't remove all files\n", + oldpkg->name); + FREELIST(skip_remove); RET_ERR(handle, ALPM_ERR_PKG_CANT_REMOVE, -1); } filenum++; } - _alpm_log(handle, ALPM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum); + _alpm_log(handle, ALPM_LOG_DEBUG, "removing %zd files\n", filenum); if(!newpkg) { /* init progress bar, but only on true remove transactions */ - PROGRESS(handle, ALPM_PROGRESS_REMOVE_START, pkgname, 0, + PROGRESS(handle, ALPM_PROGRESS_REMOVE_START, oldpkg->name, 0, pkg_count, targ_count); } /* iterate through the list backwards, unlinking files */ for(i = filelist->count; i > 0; i--) { alpm_file_t *file = filelist->files + i - 1; - int percent; - /* TODO: check return code and handle accordingly */ - unlink_file(handle, oldpkg, newpkg, file, skip_remove, - handle->trans->flags & ALPM_TRANS_FLAG_NOSAVE); + if(unlink_file(handle, oldpkg, newpkg, file, skip_remove, nosave) < 0) { + err++; + } if(!newpkg) { /* update progress bar after each file */ - percent = (position * 100) / filenum; - PROGRESS(handle, ALPM_PROGRESS_REMOVE_START, pkgname, + int percent = (position * 100) / filenum; + PROGRESS(handle, ALPM_PROGRESS_REMOVE_START, oldpkg->name, percent, pkg_count, targ_count); } position++; @@ -450,20 +428,56 @@ int _alpm_remove_single_package(alpm_handle_t *handle, if(!newpkg) { /* set progress to 100% after we finish unlinking files */ - PROGRESS(handle, ALPM_PROGRESS_REMOVE_START, pkgname, 100, + PROGRESS(handle, ALPM_PROGRESS_REMOVE_START, oldpkg->name, 100, pkg_count, targ_count); + } + + return err; +} + +int _alpm_remove_single_package(alpm_handle_t *handle, + alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg, + size_t targ_count, size_t pkg_count) +{ + const char *pkgname = oldpkg->name; + const char *pkgver = oldpkg->version; + + if(newpkg) { + _alpm_log(handle, ALPM_LOG_DEBUG, "removing old package first (%s-%s)\n", + pkgname, pkgver); + } else { + EVENT(handle, ALPM_EVENT_REMOVE_START, oldpkg, NULL); + _alpm_log(handle, ALPM_LOG_DEBUG, "removing package %s-%s\n", + pkgname, pkgver); - /* run the post-remove script if it exists */ + /* run the pre-remove scriptlet if it exists */ if(alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { char *scriptlet = _alpm_local_db_pkgpath(handle->db_local, oldpkg, "install"); - _alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL, 0); + _alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL, 0); free(scriptlet); } } -db: + if(!(handle->trans->flags & ALPM_TRANS_FLAG_DBONLY)) { + /* TODO check returned errors if any */ + remove_package_files(handle, oldpkg, newpkg, targ_count, pkg_count); + } + + /* run the post-remove script if it exists */ + if(!newpkg && alpm_pkg_has_scriptlet(oldpkg) && + !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { + char *scriptlet = _alpm_local_db_pkgpath(handle->db_local, + oldpkg, "install"); + _alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL, 0); + free(scriptlet); + } + + if(!newpkg) { + EVENT(handle, ALPM_EVENT_REMOVE_DONE, oldpkg, NULL); + } + /* remove the package from the database */ _alpm_log(handle, ALPM_LOG_DEBUG, "updating database\n"); _alpm_log(handle, ALPM_LOG_DEBUG, "removing database entry '%s'\n", pkgname); @@ -477,11 +491,6 @@ db: pkgname); } - if(!newpkg) { - /* TODO: awesome! we're passing invalid pointers. */ - EVENT(handle, ALPM_EVENT_REMOVE_DONE, oldpkg, NULL); - } - return 0; } -- 1.7.8.1

1 0

[pacman-dev] [PATCH] allow querying fileowner for directories
by andrew.gregory.8＠gmail.com 23 Dec '11

23 Dec '11

From: Andrew Gregory <andrew.gregory.8(a)gmail.com> Not allowing fileowner queries for directories was an unnecessary limitation. Queries for directories have poor performance due to having to call real_path on every directory listed in every package's file list. Because more than one package will likely own a given directory, all packages are now checked instead of bailing out after the first owner is found. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/query.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 4c2ea81..8162662 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -127,7 +127,7 @@ static int query_fileowner(alpm_list_t *targets) * iteration. */ root = alpm_option_get_root(config->handle); rootlen = strlen(root); - if(rootlen + 1 > PATH_MAX) { + if(rootlen >= PATH_MAX) { /* we are in trouble here */ pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, ""); return 1; @@ -164,12 +164,13 @@ static int query_fileowner(alpm_list_t *targets) } } + /* make sure directories end with '/' */ if(S_ISDIR(buf.st_mode)) { - pm_printf(ALPM_LOG_ERROR, - _("cannot determine ownership of directory '%s'\n"), filename); - ret++; - free(filename); - continue; + int fnlen = strlen(filename); + if(filename[fnlen-1] != '/'){ + filename = realloc(filename, sizeof(*filename) * (fnlen+2)); + strcat(filename, "/"); + } } bname = mbasename(filename); @@ -192,7 +193,7 @@ static int query_fileowner(alpm_list_t *targets) } free(dname); - for(i = alpm_db_get_pkgcache(db_local); i && !found; i = alpm_list_next(i)) { + for(i = alpm_db_get_pkgcache(db_local); i ; i = alpm_list_next(i)) { alpm_pkg_t *info = i->data; alpm_filelist_t *filelist = alpm_pkg_get_files(info); size_t j; @@ -214,7 +215,7 @@ static int query_fileowner(alpm_list_t *targets) continue; } - if(rootlen + 1 + strlen(pkgfile) > PATH_MAX) { + if(rootlen + strlen(pkgfile) >= PATH_MAX) { pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, pkgfile); } /* concatenate our file and the root path */ -- 1.7.7.3

4 9

[pacman-dev] [PATCH] Allow comments after repo section header in pacman.conf
by Allan McRae 22 Dec '11

22 Dec '11

Pacman assumes that the final character of a line specifing a repo in pacman.conf is a "]". But it did not clean whitespace from the line after removing any comments. So lines like: [allanbrokeit] # could break system caused pacman not to recognize the repo. Adjust config parsing to strip comments before trimming whitespace from the end of the string. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/conf.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 6703243..117aecd4 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -720,17 +720,19 @@ static int _parseconfig(const char *file, struct section_t *section, size_t line_len; linenum++; - strtrim(line); - line_len = strlen(line); /* ignore whole line and end of line comments */ - if(line_len == 0 || line[0] == '#') { - continue; - } if((ptr = strchr(line, '#'))) { *ptr = '\0'; } + strtrim(line); + line_len = strlen(line); + + if(line_len == 0) { + continue; + } + if(line[0] == '[' && line[line_len - 1] == ']') { char *name; /* only possibility here is a line == '[]' */ -- 1.7.8.1

2 1

[pacman-dev] [PATCH] makepkg: Use SKIP in checksum to skip integrity check
by Allan McRae 22 Dec '11

22 Dec '11

Using the value of "SKIP" in the checksum array will cause that integrity check to be skipped. This makes building packages that rely on user configurable sources less painful. Based-on-patch-by: Dan McGee <dan(a)archlinux.org> Based-on-patch-by: David Campbell <davekong(a)archlinux.us> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 7 ++++--- scripts/makepkg.sh.in | 18 +++++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index fad93e5..cd6b09f 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -120,9 +120,10 @@ of the corresponding source file. *md5sums (array)*:: This array contains an MD5 hash for every source file specified in the source array (in the same order). makepkg will use this to verify source - file integrity during subsequent builds. To easily generate md5sums, run - `makepkg -g >> PKGBUILD`. If desired, move the md5sums line to an - appropriate location. + file integrity during subsequent builds. If 'SKIP' is put in the array + in place of a normal hash, the integrity check for that source file will + be skipped. To easily generate md5sums, run ``makepkg -g >> PKGBUILD''. If + desired, move the md5sums line to an appropriate location. *sha1sums, sha256sums, sha384sums, sha512sums (arrays)*:: Alternative integrity checks that makepkg supports; these all behave diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a4a3d13..64b33c6 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -663,14 +663,18 @@ check_checksums() { fi if (( $found )) ; then - local expectedsum=$(tr '[:upper:]' '[:lower:]' <<< "${integrity_sums[$idx]}") - local realsum="$(openssl dgst -${integ} "$file")" - realsum="${realsum##* }" - if [[ $expectedsum = $realsum ]]; then - echo "$(gettext "Passed")" >&2 + if [[ ${integrity_sums[$idx]} = 'SKIP' ]]; then + echo "$(gettext "Skipped")" >&2 else - echo "$(gettext "FAILED")" >&2 - errors=1 + local expectedsum=$(tr '[:upper:]' '[:lower:]' <<< "${integrity_sums[$idx]}") + local realsum="$(openssl dgst -${integ} "$file")" + realsum="${realsum##* }" + if [[ $expectedsum = $realsum ]]; then + echo "$(gettext "Passed")" >&2 + else + echo "$(gettext "FAILED")" >&2 + errors=1 + fi fi fi -- 1.7.8.1

1 0

[pacman-dev] [PATCH] makepkg: Use SKIP in checksum to skip integrity check
by Allan McRae 22 Dec '11

22 Dec '11

Using the value of "SKIP" in the checksum array will cause that integrity check to be skipped. This makes building packages that rely on user configurable sources less painful. Based-on-patch-by: Dan McGee <dan(a)archlinux.org> Based-on-patch-by: David Campbell <davekong(a)archlinux.us> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 7 ++++--- scripts/makepkg.sh.in | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index fad93e5..cd6b09f 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -120,9 +120,10 @@ of the corresponding source file. *md5sums (array)*:: This array contains an MD5 hash for every source file specified in the source array (in the same order). makepkg will use this to verify source - file integrity during subsequent builds. To easily generate md5sums, run - `makepkg -g >> PKGBUILD`. If desired, move the md5sums line to an - appropriate location. + file integrity during subsequent builds. If 'SKIP' is put in the array + in place of a normal hash, the integrity check for that source file will + be skipped. To easily generate md5sums, run ``makepkg -g >> PKGBUILD''. If + desired, move the md5sums line to an appropriate location. *sha1sums, sha256sums, sha384sums, sha512sums (arrays)*:: Alternative integrity checks that makepkg supports; these all behave diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a4a3d13..c4a0031 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -668,6 +668,8 @@ check_checksums() { realsum="${realsum##* }" if [[ $expectedsum = $realsum ]]; then echo "$(gettext "Passed")" >&2 + elif [[ $expectedsum = 'SKIP' ]]; then + echo "$(gettext "Skipped")" >&2 else echo "$(gettext "FAILED")" >&2 errors=1 -- 1.7.8

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.1-90-g7b2f68c
by dan＠archlinux.org 22 Dec '11

22 Dec '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 7b2f68cc21df469342cb1caa7ec8fb27005cd2dd (commit) via d6ccd4439044978a6dcc01b8c1ab880b6164f9d1 (commit) via 6c1426842af7de1343b8360e2d0ca52846ea4a2f (commit) via ee969006056c86e88d5f179a7575d64f23d5b252 (commit) via 71164b76c4df1ba28d7280136050a84d39490f26 (commit) via 4c5e7af32f91771f3589eedd30ddffb72194fbe7 (commit) from 2a4df070c360bfe31d99e232b75bdea06949245f (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 7b2f68cc21df469342cb1caa7ec8fb27005cd2dd Author: Diogo Sousa <diogogsousa(a)gmail.com> Date: Wed Dec 21 23:31:55 2011 +0000 Created hex_representation() in lib/libalpm/util.c Used in alpm_compute_md5sum() and alpm_compute_sha256sum(). Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d6ccd4439044978a6dcc01b8c1ab880b6164f9d1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Dec 17 21:42:35 2011 -0500 include config.h via Makefiles Ensures that config.h is always ordered correctly (first) in the includes. Also means that new source files get this for free without having to remember to add it. We opt for -imacros over -include as its more portable, and the added constraint by -imacros doesn't bother us for config.h. This also touches the HACKING file to remove the explicit mention of config.h as part of the includes. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6c1426842af7de1343b8360e2d0ca52846ea4a2f Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 21 17:00:28 2011 -0600 Add note to HACKING about operator spacing commit ee969006056c86e88d5f179a7575d64f23d5b252 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 21 16:42:47 2011 -0600 Don't check diskspace when using --dbonly Mostly a waste of time. Sure, we no longer make sure your pacman database partition has enough space, but if you are using this option you better know what you are doing anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 71164b76c4df1ba28d7280136050a84d39490f26 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Nov 24 13:49:07 2011 -0500 sync: avoid checking file conflicts with --dbonly Scratches my own itch from FS#25667 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4c5e7af32f91771f3589eedd30ddffb72194fbe7 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 30 15:00:00 2011 -0400 delta: use regex substring matching Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 15 +++++++++- lib/libalpm/Makefile.am | 3 ++ lib/libalpm/add.c | 2 - lib/libalpm/alpm.c | 2 - lib/libalpm/backup.c | 2 - lib/libalpm/be_local.c | 2 - lib/libalpm/be_package.c | 2 - lib/libalpm/be_sync.c | 2 - lib/libalpm/conflict.c | 2 - lib/libalpm/db.c | 2 - lib/libalpm/delta.c | 45 +++++++++++++++------------------ lib/libalpm/delta.h | 2 - lib/libalpm/deps.c | 2 - lib/libalpm/diskspace.c | 2 - lib/libalpm/dload.c | 2 - lib/libalpm/error.c | 2 - lib/libalpm/graph.c | 2 - lib/libalpm/graph.h | 2 - lib/libalpm/group.c | 2 - lib/libalpm/handle.c | 2 - lib/libalpm/log.c | 2 - lib/libalpm/package.c | 2 - lib/libalpm/package.h | 2 - lib/libalpm/remove.c | 2 - lib/libalpm/signing.c | 2 - lib/libalpm/sync.c | 6 +--- lib/libalpm/trans.c | 2 - lib/libalpm/util.c | 62 ++++++++++++++++++++-------------------------- lib/libalpm/util.h | 2 - lib/libalpm/version.c | 2 - src/pacman/Makefile.am | 5 +++- src/pacman/callback.c | 2 - src/pacman/conf.c | 2 - src/pacman/database.c | 2 - src/pacman/deptest.c | 2 - src/pacman/package.c | 2 - src/pacman/pacman.c | 2 - src/pacman/query.c | 2 - src/pacman/remove.c | 2 - src/pacman/sync.c | 2 - src/pacman/upgrade.c | 2 - src/pacman/util.c | 2 - src/util/Makefile.am | 5 +++- src/util/cleanupdelta.c | 2 - src/util/pacsort.c | 2 - src/util/pactree.c | 2 - src/util/testdb.c | 2 - 47 files changed, 73 insertions(+), 148 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Created hex_representation() in lib/libalpm/util.c which is used in alpm_compute_md5sum() and alpm_compute_sha256sum().
by Diogo Sousa 21 Dec '11

21 Dec '11

[PATCH] Created hex_representation() in lib/libalpm/util.c which is used in alpm_compute_md5sum() and alpm_compute_sha256sum(). Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> --- lib/libalpm/util.c | 56 ++++++++++++++++++++++++++-------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 4eeb0cd..399331a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -917,7 +917,30 @@ static int sha2_file(const char *path, unsigned char output[32], int is224) } #endif -static const char *hex_digits = "0123456789abcdef"; +/** Create a string representing bytes in hexadecimal. + * + * @param bytes the bytes to represent in hexadecimal. + * @param size number of bytes to consider. + * @return a nul terminated string with the hexadecimal representation + * of bytes or NULL on error. This string must be freed. + */ +static char *hex_representation(unsigned char *bytes, size_t size) +{ + static const char *hex_digits = "0123456789abcdef"; + char *str; + int i; + + MALLOC(str, 2 * size + 1, return NULL); + + for (i = 0; i < size; i++) { + str[2 * i] = hex_digits[bytes[i] >> 4]; + str[2 * i + 1] = hex_digits[bytes[i] & 0x0f]; + } + + str[2 * size] = '\0'; + + return str; +} /** Get the md5 sum of file. * @param filename name of the file @@ -927,29 +950,17 @@ static const char *hex_digits = "0123456789abcdef"; char SYMEXPORT *alpm_compute_md5sum(const char *filename) { unsigned char output[16]; - char *md5sum; - int ret, i; + int ret; ASSERT(filename != NULL, return NULL); - MALLOC(md5sum, (size_t)33, return NULL); - /* defined above for OpenSSL, otherwise defined in md5.h */ ret = md5_file(filename, output); if(ret > 0) { - free(md5sum); return NULL; } - /* Convert the result to something readable */ - for(i = 0; i < 16; i++) { - int pos = i * 2; - /* high 4 bits are first digit, low 4 are second */ - md5sum[pos] = hex_digits[output[i] >> 4]; - md5sum[pos + 1] = hex_digits[output[i] & 0x0f]; - } - md5sum[32] = '\0'; - return md5sum; + return hex_representation(output, 16); } /** Get the sha256 sum of file. @@ -960,29 +971,18 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename) char SYMEXPORT *alpm_compute_sha256sum(const char *filename) { unsigned char output[32]; - char *sha256sum; - int ret, i; + int ret; ASSERT(filename != NULL, return NULL); - MALLOC(sha256sum, (size_t)65, return NULL); /* defined above for OpenSSL, otherwise defined in sha2.h */ ret = sha2_file(filename, output, 0); if(ret > 0) { - free(sha256sum); return NULL; } - /* Convert the result to something readable */ - for(i = 0; i < 32; i++) { - int pos = i * 2; - /* high 4 bits are first digit, low 4 are second */ - sha256sum[pos] = hex_digits[output[i] >> 4]; - sha256sum[pos + 1] = hex_digits[output[i] & 0x0f]; - } - sha256sum[64] = '\0'; - return sha256sum; + return hex_representation(output, 32); } /** Calculates a file's MD5 or SHA2 digest and compares it to an expected value. -- 1.7.8

1 0

[pacman-dev] [PATCH] Created hex_representation() in lib/libalpm/util.c which is used in alpm_compute_md5sum() and alpm_compute_sha256sum().
by Diogo Sousa 21 Dec '11

21 Dec '11

Created hex_representation() in lib/libalpm/util.c which is used in alpm_compute_md5sum() and alpm_compute_sha256sum(). Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> --- lib/libalpm/util.c | 56 ++++++++++++++++++++++++++-------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 4eeb0cd..2fe6087 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -917,7 +917,30 @@ static int sha2_file(const char *path, unsigned char output[32], int is224) } #endif -static const char *hex_digits = "0123456789abcdef"; +/** Create a string representing bytes in hexadecimal. + * + * @param bytes the bytes to represent in hexadecimal. + * @param size number of bytes to consider. + * @return a nul terminated string with the hexadecimal representation + * of bytes or NULL on error. This string must be freed. + */ +static char *hex_representation(unsigned char *bytes, size_t size) +{ + const char *hex_digits = "0123456789abcdef"; + char *str; + int i; + + MALLOC(str, 2 * size + 1, return NULL); + + for (i=0; i < size; i++) { + str[2 * i] = hex_digits[bytes[i] >> 4]; + str[2 * i + 1] = hex_digits[bytes[i] & 0x0f]; + } + + str[2 * size] = '\0'; + + return str; +} /** Get the md5 sum of file. * @param filename name of the file @@ -927,29 +950,17 @@ static const char *hex_digits = "0123456789abcdef"; char SYMEXPORT *alpm_compute_md5sum(const char *filename) { unsigned char output[16]; - char *md5sum; - int ret, i; + int ret; ASSERT(filename != NULL, return NULL); - MALLOC(md5sum, (size_t)33, return NULL); - /* defined above for OpenSSL, otherwise defined in md5.h */ ret = md5_file(filename, output); if(ret > 0) { - free(md5sum); return NULL; } - /* Convert the result to something readable */ - for(i = 0; i < 16; i++) { - int pos = i * 2; - /* high 4 bits are first digit, low 4 are second */ - md5sum[pos] = hex_digits[output[i] >> 4]; - md5sum[pos + 1] = hex_digits[output[i] & 0x0f]; - } - md5sum[32] = '\0'; - return md5sum; + return hex_representation(output, 16); } /** Get the sha256 sum of file. @@ -960,30 +971,18 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename) char SYMEXPORT *alpm_compute_sha256sum(const char *filename) { unsigned char output[32]; - char *sha256sum; - int ret, i; + int ret; ASSERT(filename != NULL, return NULL); - MALLOC(sha256sum, (size_t)65, return NULL); /* defined above for OpenSSL, otherwise defined in sha2.h */ ret = sha2_file(filename, output, 0); if(ret > 0) { - free(sha256sum); return NULL; } - /* Convert the result to something readable */ - for(i = 0; i < 32; i++) { - int pos = i * 2; - /* high 4 bits are first digit, low 4 are second */ - sha256sum[pos] = hex_digits[output[i] >> 4]; - sha256sum[pos + 1] = hex_digits[output[i] & 0x0f]; - } - sha256sum[64] = '\0'; - return sha256sum; + return hex_representation(output, 32); } /** Calculates a file's MD5 or SHA2 digest and compares it to an expected value. -- 1.7.8

2 1