- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] Add note to HACKING about operator spacing
by Dan McGee 21 Dec '11

21 Dec '11

--- HACKING | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/HACKING b/HACKING index 6692f7e..adfa94b 100644 --- a/HACKING +++ b/HACKING @@ -90,6 +90,17 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data) NOT if(!strcmp(a, b)) +8. Use spaces around almost all arithmetic, comparison and assignment + operators and after all ',;:' separators. + + foobar[2 * size + 1] = function(a, 6); + NOT + foobar[2*size+1]=function(a,6); + + for(a = 0; a < n, n > 0; a++) {} + NOT + for(a=0;a<n,n>0;a++) {} + Other Concerns -------------- -- 1.7.8

3 2

[pacman-dev] [PATCH] include config.h via Makefiles
by Dave Reisner 21 Dec '11

21 Dec '11

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. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Note that when I say "portable", I mean gcc, clang, and icc all support the option. I think that covers most of our bases. 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 | 2 -- 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 | 2 -- lib/libalpm/trans.c | 2 -- lib/libalpm/util.c | 2 -- 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 -- 46 files changed, 11 insertions(+), 88 deletions(-) diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 99f9c1b..61dcb87 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -7,6 +7,9 @@ include_HEADERS = alpm_list.h alpm.h DEFS = -DLOCALEDIR=\"@localedir@\" @DEFS@ +AM_CPPFLAGS = \ + -imacros $(top_builddir)/config.h + AM_CFLAGS = -pedantic -D_GNU_SOURCE if ENABLE_VISIBILITY_CC diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 78615bb..014990d 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <errno.h> #include <string.h> diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index e957f1a..3f7ab4b 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -21,8 +21,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #ifdef HAVE_LIBCURL #include <curl/curl.h> #endif diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index 728c1d0..68856de 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -21,8 +21,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <string.h> diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 606f9e1..2deef22 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <unistd.h> #include <stdio.h> #include <stdlib.h> diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 4f530e0..41ecc75 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <string.h> #include <errno.h> diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 54c4f87..abc4a99 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <errno.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 5703aba..b5c55dc 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -22,8 +22,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 7708d18..3e53435 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -22,8 +22,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 6315a85..5346716 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <string.h> #include <stdint.h> /* intmax_t */ diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index 05df420..42353f5 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -20,8 +20,6 @@ #ifndef _ALPM_DELTA_H #define _ALPM_DELTA_H -#include "config.h" /* ensure off_t is correct length */ - #include <sys/types.h> /* off_t */ #include "alpm.h" diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 9f7e902..9d7e547 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -20,8 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index cfd6402..274aa67 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <errno.h> #if defined(HAVE_MNTENT_H) #include <mntent.h> diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index bcbc809..a3980d6 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <errno.h> diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 044dec7..528a3dc 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #ifdef HAVE_LIBCURL #include <curl/curl.h> #endif diff --git a/lib/libalpm/graph.c b/lib/libalpm/graph.c index 3a7f24b..d080e05 100644 --- a/lib/libalpm/graph.c +++ b/lib/libalpm/graph.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include "graph.h" #include "util.h" #include "log.h" diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h index d4d134b..2910b7d 100644 --- a/lib/libalpm/graph.h +++ b/lib/libalpm/graph.h @@ -19,8 +19,6 @@ #ifndef _ALPM_GRAPH_H #define _ALPM_GRAPH_H -#include "config.h" /* ensure off_t is correct length */ - #include <sys/types.h> /* off_t */ #include "alpm_list.h" diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c index 47458df..8b407b2 100644 --- a/lib/libalpm/group.c +++ b/lib/libalpm/group.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <string.h> diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 01f5955..6518b7d 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -20,8 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <errno.h> #include <stdlib.h> #include <string.h> diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index 692ff79..14b454e 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <stdarg.h> #include <errno.h> diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index e96177a..68fec16 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -21,8 +21,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <string.h> #include <sys/types.h> diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 82a8326..172d2f3 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -24,8 +24,6 @@ #ifndef _ALPM_PACKAGE_H #define _ALPM_PACKAGE_H -#include "config.h" /* ensure off_t is correct length */ - #include <sys/types.h> /* off_t */ #include "alpm.h" diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index d7e06bc..8967eff 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -22,8 +22,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <errno.h> #include <string.h> diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 0bef445..fbb6b13 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 3817ec8..b10f3e8 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -21,8 +21,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <sys/types.h> /* off_t */ #include <stdlib.h> #include <stdio.h> diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index cb97a4a..5ceaaa7 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -21,8 +21,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 4eeb0cd..b2974a4 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -22,8 +22,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <unistd.h> #include <ctype.h> diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 1e19274..54e69c1 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -24,8 +24,6 @@ #ifndef _ALPM_UTIL_H #define _ALPM_UTIL_H -#include "config.h" - #include "alpm_list.h" #include "alpm.h" #include "package.h" /* alpm_pkg_t */ diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c index 6b65a41..a88b818 100644 --- a/lib/libalpm/version.c +++ b/lib/libalpm/version.c @@ -15,8 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <string.h> #include <ctype.h> diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 3790bdf..795b2d1 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -17,7 +17,10 @@ DEFS = -DLOCALEDIR=\"@localedir@\" \ -DCACHEDIR=\"$(cachedir)\" \ -DLOGFILE=\"$(logfile)\" \ @DEFS@ -INCLUDES = -I$(top_srcdir)/lib/libalpm + +AM_CPPFLAGS = \ + -imacros $(top_builddir)/config.h \ + -I$(top_srcdir)/lib/libalpm AM_CFLAGS = -pedantic -D_GNU_SOURCE diff --git a/src/pacman/callback.c b/src/pacman/callback.c index c118940..87ba30a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 482a86d..6703243 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <errno.h> #include <glob.h> #include <limits.h> diff --git a/src/pacman/database.c b/src/pacman/database.c index 3e4a672..b973661 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <alpm.h> diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index 0bf9cd8..63e7985 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <alpm.h> diff --git a/src/pacman/package.c b/src/pacman/package.c index d4bbf88..233e8e2 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index d2fa62f..3e17d90 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - /* special handling of package version for GIT */ #if defined(GIT_VERSION) #undef PACKAGE_VERSION diff --git a/src/pacman/query.c b/src/pacman/query.c index 4c2ea81..66813e3 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <stdint.h> diff --git a/src/pacman/remove.c b/src/pacman/remove.c index b6da7c3..3de5769 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <fnmatch.h> #include <stdlib.h> #include <stdio.h> diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 9015b08..a13b6c7 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 650af6b..87f7c39 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/src/pacman/util.c b/src/pacman/util.c index 12f3dca..7846291 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <sys/types.h> #include <sys/ioctl.h> #include <sys/stat.h> diff --git a/src/util/Makefile.am b/src/util/Makefile.am index e4af56c..57ba639 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -11,7 +11,10 @@ DEFS = -DLOCALEDIR=\"@localedir@\" \ -DDBPATH=\"$(dbpath)\" \ -DCACHEDIR=\"$(cachedir)\" \ @DEFS@ -INCLUDES = -I$(top_srcdir)/lib/libalpm + +AM_CPPFLAGS = \ + -imacros $(top_builddir)/config.h + -I$(top_srcdir)/lib/libalpm AM_CFLAGS = -pedantic -D_GNU_SOURCE diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index d6bd0e8..ea34fe7 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 0eedf59..7275cc7 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <errno.h> #include <getopt.h> #include <stdio.h> diff --git a/src/util/pactree.c b/src/util/pactree.c index f95c5e8..55d63d7 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <ctype.h> #include <getopt.h> #include <stdio.h> diff --git a/src/util/testdb.c b/src/util/testdb.c index b15bbe5..4f6bfed 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <unistd.h> #include <stdio.h> #include <stdlib.h> -- 1.7.8

2 2

[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) +{ + 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

2 2