- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] libalpm: never attempt to remove a mountpoint
by Allan McRae 13 Feb '13

13 Feb '13

From: Dave Reisner <dreisner(a)archlinux.org> Arch Linux typically runs into this with /sys when upgrading the filesystem package in build chroots, but LXC users might also run into this, since their /sys is shared from the host and must, for security reasons, be mounted RO. I've neglected to add any tests for this because they would require root in order to run. Current tests all pass with this patch and I've confirmed the desired behavior in a VM. Incidentally, the first hunk of this patch (skipping can_remove_file checks for directories) resolves the case of API mountpoints being removed since they eventually fall into unlink_file and fail with "contains files". However, this patch should still be the Right Thing To Do™, as we can't possibly remove a directory that is also a mountpoint. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> [Allan] Do not skip checking if directories can be removed. Instead test if directories are mountpoints in can_remove_file. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is an updated version of Dave's original patch. Instead of skipping all directory checks which could result in us trying to remove empty directories on read-only file systems, test all directories to see if they are a mountpoint during can_remove_file. This is hugely inefficient... it results in two stat calls per directory, but it fixes the current issue. A better fix would require completely rewriting the pre-removal checks to be done globally and not on a per package basis. lib/libalpm/remove.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 50fc93c..64888c5 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -267,6 +267,37 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) return 0; } +static int dir_is_mountpoint(alpm_handle_t *handle, const char *directory, + const struct stat *stbuf) +{ + char parent_dir[PATH_MAX]; + struct stat parent_stbuf; + dev_t dir_st_dev; + + if(stbuf == NULL) { + struct stat dir_stbuf; + if(stat(directory, &dir_stbuf) < 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "failed to stat directory %s: %s", + directory, strerror(errno)); + return 0; + } + dir_st_dev = dir_stbuf.st_dev; + } else { + dir_st_dev = stbuf->st_dev; + } + + snprintf(parent_dir, PATH_MAX, "%s..", directory); + if(stat(parent_dir, &parent_stbuf) < 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "failed to stat parent of %s: %s: %s", + directory, parent_dir, strerror(errno)); + return 0; + } + + return dir_st_dev != parent_stbuf.st_dev; +} + /** * @brief Check if alpm can delete a file. * @@ -286,6 +317,12 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, return 1; } + if(file->name[strlen(file->name) - 1] == '/' && + dir_is_mountpoint(handle, file->name, NULL)) { + /* we do not remove mountpoints */ + return 1; + } + snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name); /* If we fail write permissions due to a read-only filesystem, abort. * Assume all other possible failures are covered somewhere else */ @@ -427,6 +464,9 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, fileobj->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "keeping directory %s (in new package)\n", file); + } else if(dir_is_mountpoint(handle, file, &buf)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "keeping directory %s (mountpoint)\n", file); } else { /* one last check- does any other package own this file? */ alpm_list_t *local, *local_pkgs; -- 1.8.1.3

2 1

[pacman-dev] [PATCH] Fix registering database with non-gpgme builds
by Allan McRae 11 Feb '13

11 Feb '13

We record whether the default SigLevel is set in order to add upon it for the *FileSigLevel entries. When using the only valid value of "SigLevel = Never" with non-gpgme builds, we need to ignore the ALPM_SIG_PACKAGE_SET flag when determining if we have a valid value for the database SigLevel. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 92be949..1cbe055 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -651,7 +651,7 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, _alpm_log(handle, ALPM_LOG_DEBUG, "registering sync database '%s'\n", treename); #ifndef HAVE_LIBGPGME - if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { + if((level &= ~ALPM_SIG_PACKAGE_SET) != 0 && level != ALPM_SIG_USE_DEFAULT) { RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL); } #endif -- 1.8.1.3

1 0

[pacman-dev] [PATCH] Fix --without-gpgme build
by Allan McRae 11 Feb '13

11 Feb '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This just fixes the build... something is very wrong there: Total = 278 Pass = 161 ( 57.91%) Expected Fail = 8 ( 2.88%) Unexpected Pass = 3 ( 1.08%) Fail = 106 ( 38.13%) lib/libalpm/sync.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index c76b502..be55500 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -969,6 +969,7 @@ finish: return errors; } +#ifdef HAVE_LIBGPGME static int check_keyring(alpm_handle_t *handle) { size_t current = 0, numtargs; @@ -1038,6 +1039,7 @@ static int check_keyring(alpm_handle_t *handle) return 0; } +#endif /* HAVE_LIBGPGME */ static int check_validity(alpm_handle_t *handle, size_t total, size_t total_bytes) -- 1.8.1.3

1 0

[pacman-dev] [PATCH] Fix gpgme detection
by Allan McRae 11 Feb '13

11 Feb '13

The gpgme detection had a couple of issues which are fixed: 1) In some cases it would not error out when gpgme was missing and --with-gpgme was passed. 2) In some cases, the CFLAGS/LDFLAGS etc would not be properly restored. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index a7364ba..1e1c37c 100644 --- a/configure.ac +++ b/configure.ac @@ -246,13 +246,14 @@ AS_IF([test "x$with_gpgme" != "xno"], unset GPGME_CFLAGS] AS_IF([test "x$with_gpgme" = "xyes"], [AC_MSG_FAILURE([*** gpgme >= 1.3.0 is needed for GPG signature support])]) - )], - [with_gpgme=no])] - [LIBS="$LIBS_save" + ) + + LIBS="$LIBS_save" CPPFLAGS="$CPPFLAGS_save" CFLAGS="$CFLAGS_save" unset CPPFLAGS_save - unset CFLAGS_save]) + unset CFLAGS_save],)]) + AS_IF([test "x$have_gpgme" = xno -a "x$with_gpgme" = xyes], [AC_MSG_FAILURE([--with-gpgme was given, but gpgme was not found])]) AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$have_gpgme" = "xyes"]) -- 1.8.1.3

1 0

[pacman-dev] [PATCH 1/2] Fix --enable-warningflags
by Allan McRae 10 Feb '13

10 Feb '13

gcc gives an error on an unknown warning flag, but clang just gives a warning. Upgrade the warning in clang to an error by activating -Werror=unknown-warning-option if available. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Tested with clang and gcc. Both give the right result. m4/acinclude.m4 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index e601f0e..294507e 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -114,6 +114,10 @@ AC_DEFUN([CFLAGS_ADD], [AS_VAR_PUSHDEF([my_cflags], [cflags_cv_warn_$1])dnl AC_CACHE_CHECK([whether compiler handles $1], [my_cflags], [ save_CFLAGS="$CFLAGS" + CFLAGS="${CFLAGS} -Werror=unknown-warning-option" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + [], + [CFLAGS="$save_CFLAGS"]) CFLAGS="${CFLAGS} $1" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AS_VAR_SET([my_cflags], [yes])], -- 1.8.1.3

1 0

[pacman-dev] [PATCH] Add format attributes to all required functions
by Allan McRae 10 Feb '13

10 Feb '13

Fixes all clang warnings with -Wformat-literal. Also, fix genuine formating issue discovered once adding these attributes and add a cast to prevent a gcc warning. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 3 ++- lib/libalpm/log.c | 4 ++-- lib/libalpm/trans.c | 4 ++-- lib/libalpm/util.h | 5 ++++- src/pacman/callback.h | 1 + src/pacman/util.c | 3 ++- src/pacman/util.h | 6 +++--- src/util/cleanupdelta.c | 1 + src/util/testdb.c | 1 + src/util/testpkg.c | 1 + 10 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 729a4c8..14443bb 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -271,8 +271,9 @@ typedef enum _alpm_loglevel_t { } alpm_loglevel_t; typedef void (*alpm_cb_log)(alpm_loglevel_t, const char *, va_list); + int alpm_logaction(alpm_handle_t *handle, const char *prefix, - const char *fmt, ...); + const char *fmt, ...) __attribute__((format(printf, 3, 4))); /** * Events. diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index a8639b4..271bd00 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -39,8 +39,8 @@ * @param fmt output format * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix, const - char *fmt, ...) +int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix, + const char *fmt, ...) { int ret; va_list args; diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index b0488eb..8d4e0e7 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -218,8 +218,8 @@ int SYMEXPORT alpm_trans_release(alpm_handle_t *handle) if(_alpm_handle_unlock(handle)) { _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"), handle->lockfile); - alpm_logaction(handle, "warning: could not remove lock file %s\n", - handle->lockfile); + alpm_logaction(handle, ALPM_CALLER_PREFIX, + "warning: could not remove lock file %s\n", handle->lockfile); } } diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 93b6573..56031f3 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -120,7 +120,10 @@ int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, alpm_list_t *list, int breakfirst); ssize_t _alpm_files_in_directory(alpm_handle_t *handle, const char *path, int full_count); -int _alpm_logaction(alpm_handle_t *handle, const char *prefix, const char *fmt, va_list args); + +int _alpm_logaction(alpm_handle_t *handle, const char *prefix, const char *fmt, va_list args) + __attribute__((format(printf, 3, 0))); + int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]); int _alpm_ldconfig(alpm_handle_t *handle); int _alpm_str_cmp(const void *s1, const void *s2); diff --git a/src/pacman/callback.h b/src/pacman/callback.h index 4717360..a291fc7 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -41,6 +41,7 @@ void cb_dl_total(off_t total); void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total); /* callback to handle messages/notifications from pacman library */ +__attribute__((format(printf, 2, 0))) void cb_log(alpm_loglevel_t level, const char *fmt, va_list args); #endif /* _PM_CALLBACK_H */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 03063fb..6afd701 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -992,7 +992,7 @@ static char *pkg_get_location(alpm_pkg_t *pkg) case PM_OP_SYNC: servers = alpm_db_get_servers(alpm_pkg_get_db(pkg)); if(servers) { - pm_asprintf(&string, "%s/%s", servers->data, + pm_asprintf(&string, "%s/%s", (char *)(servers->data), alpm_pkg_get_filename(pkg)); return string; } @@ -1443,6 +1443,7 @@ int select_question(int count) /* presents a prompt and gets a Y/N answer */ +__attribute__((format(printf, 2, 0))) static int question(short preset, char *fmt, va_list args) { char response[32]; diff --git a/src/pacman/util.h b/src/pacman/util.h index c38291a..2d1e698 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -72,11 +72,11 @@ void print_packages(const alpm_list_t *packages); void select_display(const alpm_list_t *pkglist); int select_question(int count); int multiselect_question(char *array, int count); -int yesno(char *fmt, ...); -int noyes(char *fmt, ...); +int yesno(char *fmt, ...) __attribute__((format(printf, 1, 2))); +int noyes(char *fmt, ...) __attribute__((format(printf, 1, 2))); int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); -int pm_asprintf(char **string, const char *format, ...); +int pm_asprintf(char **string, const char *format, ...) __attribute__((format(printf,2,3))); int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 144e038..4f34435 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -37,6 +37,7 @@ static void cleanup(int signum) exit(signum); } +__attribute__((format(printf, 2, 0))) static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { if(strlen(fmt)) { diff --git a/src/util/testdb.c b/src/util/testdb.c index 2017b60..7b08cb0 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -40,6 +40,7 @@ static void cleanup(int signum) exit(signum); } +__attribute__((format(printf, 2, 0))) static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { if(strlen(fmt)) { diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 96400a7..10b2f2c 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -24,6 +24,7 @@ #define BASENAME "testpkg" +__attribute__((format(printf, 2, 0))) static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { if(fmt[0] == '\0') { -- 1.8.1.3

2 2

[pacman-dev] [PATCH] Fix --enable-warningflags
by Allan McRae 10 Feb '13

10 Feb '13

We need to to set -Werror to ensure the compiler bail when a warning flag is unavailable. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- m4/acinclude.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index e601f0e..0f7ee8f 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -114,7 +114,7 @@ AC_DEFUN([CFLAGS_ADD], [AS_VAR_PUSHDEF([my_cflags], [cflags_cv_warn_$1])dnl AC_CACHE_CHECK([whether compiler handles $1], [my_cflags], [ save_CFLAGS="$CFLAGS" - CFLAGS="${CFLAGS} $1" + CFLAGS="${CFLAGS} -Werror $1" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AS_VAR_SET([my_cflags], [yes])], [AS_VAR_SET([my_cflags], [no])]) -- 1.8.1.3

1 1

[pacman-dev] [PATCH] fix clang -Wformat-nonliteral warnings
by Andrew Gregory 10 Feb '13

10 Feb '13

GCC is smart enough not to issue a warning when calling a printf function using a va_list; clang is not. Selectively disable the warning using pragmas to allow building with warnings using clang. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Adding a bunch of pragmas doesn't strike me as an ideal solution, but clang's warning flag documentation is non-existent and I can't find another solution other than removing -Wformat-nonliteral altogether. lib/libalpm/util.c | 3 +++ src/pacman/callback.c | 3 +++ src/pacman/util.c | 12 ++++++++++++ src/util/cleanupdelta.c | 3 +++ src/util/testdb.c | 3 +++ src/util/testpkg.c | 4 ++++ 6 files changed, 28 insertions(+) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index f4c33a0..a2f279c 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -463,6 +463,8 @@ int _alpm_logaction(alpm_handle_t *handle, const char *prefix, prefix = "UNKNOWN"; } +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" if(handle->usesyslog) { /* we can't use a va_list more than once, so we need to copy it * so we can use the original when calling vfprintf below. */ @@ -486,6 +488,7 @@ int _alpm_logaction(alpm_handle_t *handle, const char *prefix, ret = vfprintf(handle->logstream, fmt, args); fflush(handle->logstream); } +#pragma clang diagnostic pop return ret; } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index edd5b39..16a04f3 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -772,6 +772,8 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) return; } +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" if(on_progress) { char *string = NULL; pm_vasprintf(&string, level, fmt, args); @@ -781,6 +783,7 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) } else { pm_vfprintf(stderr, level, fmt, args); } +#pragma clang diagnostic pop } /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 03063fb..da3170a 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1460,7 +1460,10 @@ static int question(short preset, char *fmt, va_list args) fflush(stdout); fflush(stderr); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" vfprintf(stream, fmt, args); +#pragma clang diagnostic pop if(preset) { fprintf(stream, " %s ", _("[Y/n]")); @@ -1526,10 +1529,13 @@ int pm_printf(alpm_loglevel_t level, const char *format, ...) int ret; va_list args; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" /* print the message using va_arg list */ va_start(args, format); ret = pm_vfprintf(stderr, level, format, args); va_end(args); +#pragma clang diagnostic pop return ret; } @@ -1539,6 +1545,8 @@ int pm_asprintf(char **string, const char *format, ...) int ret = 0; va_list args; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" /* print the message using va_arg list */ va_start(args, format); if(vasprintf(string, format, args) == -1) { @@ -1546,6 +1554,7 @@ int pm_asprintf(char **string, const char *format, ...) ret = -1; } va_end(args); +#pragma clang diagnostic pop return ret; } @@ -1561,7 +1570,10 @@ int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_li } /* print the message using va_arg list */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" ret = vasprintf(&msg, format, args); +#pragma clang diagnostic pop /* print a prefix to the message */ switch(level) { diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 144e038..ff17427 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -39,6 +39,8 @@ static void cleanup(int signum) static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" if(strlen(fmt)) { switch(level) { case ALPM_LOG_ERROR: printf("error: "); break; @@ -48,6 +50,7 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) } vprintf(fmt, args); } +#pragma clang diagnostic pop } diff --git a/src/util/testdb.c b/src/util/testdb.c index 2017b60..776d73e 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -42,6 +42,8 @@ static void cleanup(int signum) static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" if(strlen(fmt)) { switch(level) { case ALPM_LOG_ERROR: printf("error: "); break; @@ -50,6 +52,7 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) } vprintf(fmt, args); } +#pragma clang diagnostic pop } static int check_localdb_files(void) diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 96400a7..d310628 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -34,7 +34,11 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) case ALPM_LOG_WARNING: printf("warning: "); break; default: return; /* skip other messages */ } + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" vprintf(fmt, args); +#pragma clang diagnostic pop } int main(int argc, char *argv[]) -- 1.8.1.3

2 1

[pacman-dev] Pacman build is currently broken
by Dan McGee 10 Feb '13

10 Feb '13

Using the superior warnings of clang: dmcgee@galway ~/projects/pacman $ make make --no-print-directory all-recursive Making all in lib/libalpm Making all in po CC libalpm_la-signing.lo signing.c:195:5: error: variable 'ctx' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if(init_gpgme(handle)) { ^~~~~~~~~~~~~~~~~~ signing.c:219:16: note: uninitialized use occurs here gpgme_release(ctx); ^~~ signing.c:195:2: note: remove the 'if' if its condition is always false if(init_gpgme(handle)) { ^~~~~~~~~~~~~~~~~~~~~~~~ signing.c:191:17: note: initialize the variable 'ctx' to silence this warning gpgme_ctx_t ctx; ^ = NULL 1 error generated. make[3]: *** [libalpm_la-signing.lo] Error 1 make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 dmcgee@galway ~/projects/pacman $ git show-ref HEAD 390b08f18b4ef550230f9f4749fb52254ccba6e5 refs/remotes/origin/HEAD

2 1

[pacman-dev] [PATCH] Fix compilation error on clang
by Allan McRae 10 Feb '13

10 Feb '13

This also lead me to notice that in _alpm_gpgme_checksig many things were not being cleaned up. Fix this by having CHECK_ERR goto gpg_error and make the required adjustments. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/signing.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index a57c946..5711f82 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -37,7 +37,7 @@ #if HAVE_LIBGPGME #define CHECK_ERR(void) do { \ - if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { goto error; } \ + if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { goto gpg_error; } \ } while(0) /** @@ -174,7 +174,7 @@ static int init_gpgme(alpm_handle_t *handle) init = 1; return 0; -error: +gpg_error: _alpm_log(handle, ALPM_LOG_ERROR, _("GPGME error: %s\n"), gpgme_strerror(err)); RET_ERR(handle, ALPM_ERR_GPGME, -1); } @@ -188,7 +188,7 @@ error: int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr) { gpgme_error_t err; - gpgme_ctx_t ctx; + gpgme_ctx_t ctx = NULL; gpgme_key_t key; int ret = -1; @@ -215,8 +215,10 @@ int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr) } gpgme_key_unref(key); -error: +gpg_error: gpgme_release(ctx); + +error: return ret; } @@ -279,9 +281,7 @@ static int key_search(alpm_handle_t *handle, const char *fpr, } } - if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { - goto error; - } + CHECK_ERR(); /* should only get here if key actually exists */ pgpkey->data = key; @@ -319,7 +319,7 @@ static int key_search(alpm_handle_t *handle, const char *fpr, ret = 1; -error: +gpg_error: if(ret != 1) { _alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err)); } @@ -371,7 +371,7 @@ static int key_import(alpm_handle_t *handle, alpm_pgpkey_t *key) ret = 0; } -error: +gpg_error: gpgme_release(ctx); return ret; } -- 1.8.1.3

1 1