- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] pacsort: add -f, --files option for sorting filenames
by Dave Reisner 24 Jan '13

24 Jan '13

Teach pacsort to understand package filenames and optionally strip away some of the context. alpm_pkg_vercmp() intentionally only understands pure versions, so strings such as '18.0-2-x86_64' and '18.0.1-1-x86_64' will be compared wrongly. Partially addresses FS#33455. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- src/util/pacsort.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- test/util/pacsorttest.sh | 15 +++++++++++++++ 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/src/util/pacsort.c b/src/util/pacsort.c index c7b8c94..b8c8aac 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -18,6 +18,7 @@ */ #include <errno.h> +#include <fnmatch.h> #include <getopt.h> #include <stdio.h> #include <stdlib.h> @@ -43,6 +44,7 @@ static struct options_t { int order; int sortkey; int null; + int filemode; char delim; } opts; @@ -259,15 +261,50 @@ static const char *nth_column(const char *string) static int vercmp(const void *p1, const void *p2) { const char *name1, *name2; + char *fn1 = NULL, *fn2 = NULL; + int r; name1 = *(const char **)p1; name2 = *(const char **)p2; + /* if we're operating in file mode, we modify the strings under certain + * conditions to appease alpm_pkg_vercmp(). If and only if both inputs end + * with a suffix that appears to be a package name, we strip the suffix and + * remove any leading paths. This means that strings such as: + * + * /var/cache/pacman/pkg/firefox-18.0-2-x86_64.pkg.tar.xz + * firefox-18.0-2-x86_64.pkg.tar.gz + * + * Will be considered equal by this version comparison + */ + if(opts.filemode) { + if(fnmatch("*-*.pkg.tar.?z", name1, 0) == 0 && + fnmatch("*-*.pkg.tar.?z", name2, 0) == 0) { + char *s, *e; + + s = strchr(name1, '/'); + e = strrchr(name1, '-'); + fn1 = strndup(name1, e - (s ? s : name1)); + + s = strchr(name2, '/'); + e = strrchr(name2, '-'); + fn2 = strndup(name2, e - (s ? s : name2)); + + name1 = fn1; + name2 = fn2; + } + } + if(opts.sortkey == 0) { - return opts.order * alpm_pkg_vercmp(name1, name2); + r = opts.order * alpm_pkg_vercmp(name1, name2); } else { - return opts.order * alpm_pkg_vercmp(nth_column(name1), nth_column(name2)); + r = opts.order * alpm_pkg_vercmp(nth_column(name1), nth_column(name2)); } + + free(fn1); + free(fn2); + + return r; } static char escape_char(const char *string) @@ -304,6 +341,7 @@ static void usage(void) { fprintf(stderr, "pacsort v" PACKAGE_VERSION "\n" "Usage: pacsort [options] [files...]\n\n" + " -f, --files assume inputs are filepaths of packages\n" " -h, --help display this help message\n" " -k, --key <index> sort input starting on specified column\n" " -r, --reverse sort in reverse order (default: oldest to newest)\n" @@ -316,6 +354,7 @@ static int parse_options(int argc, char **argv) int opt; static const struct option opttable[] = { + {"files", no_argument, 0, 'f'}, {"help", no_argument, 0, 'h'}, {"key", required_argument, 0, 'k'}, {"reverse", no_argument, 0, 'r'}, @@ -324,8 +363,11 @@ static int parse_options(int argc, char **argv) {0, 0, 0, 0} }; - while((opt = getopt_long(argc, argv, "hk:rt:z", opttable, NULL)) != -1) { + while((opt = getopt_long(argc, argv, "fhk:rt:z", opttable, NULL)) != -1) { switch(opt) { + case 'f': + opts.filemode = 1; + break; case 'h': return 1; case 'k': diff --git a/test/util/pacsorttest.sh b/test/util/pacsorttest.sh index 9d52d69..7ab0de4 100755 --- a/test/util/pacsorttest.sh +++ b/test/util/pacsorttest.sh @@ -66,6 +66,21 @@ runtest $in $ex "add trailing newline" in="1.0-1\n1.0\n1.0-2\n1.0\n" runtest $in $in "stable sort" +in="firefox-18.0-2-x86_64.pkg.tar.xz\nfirefox-18.0.1-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename sort" "--files" + +in="firefox-18.0-2\nfirefox-18.0.1-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename sort with invalid filename" "--files" + +in="firefox-18.0-2-x86_64.pkg.tar.xz\n/path2/firefox-18.0.1-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename sort maybe with leading paths" "--files" + +in="/path1/firefox-18.0-2-x86_64.pkg.tar.xz\n/path2/firefox-18.0.1-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename sort with different leading paths" "--files" + +in="firefox-18.0-2-i686.pkg.tar.xz\nfirefox-18.0.1-1-x86_64.pkg.tar.gz\n" +runtest $in $in "filename sort with different extensions" "--files" + # generate some long input/expected for the next few tests declare normal reverse names_normal names_reverse for ((i=1; i<600; i++)); do -- 1.8.1.1

4 5

[pacman-dev] [PATCH 0/4] [RFC] add caller prefix to alpm_logaction
by Andrew Gregory 24 Jan '13

24 Jan '13

Implements the following TODO from alpm_logaction in log.c: > TODO We should add a prefix to log strings depending on who called us. > If logaction was called by the frontend: > USER: <the frontend log> > and if called internally: > ALPM: <the library log> > Moreover, the frontend should be able to choose its prefix > (USER by default?): > pacman: "PACMAN" > kpacman: "KPACMAN" > This would allow us to share the log file between several frontends > and know who does what The log prefix can be added two different ways. To make it easier for frontends, handle->program can be set to the program name (defaults to "USER") which will be used for calls to alpm_logaction. The prefix can be set per call with alpm_plogaction; this is what alpm does. Resulting logfile looks like this: > [2012-12-20 16:29] [PACMAN] Running '/home/ag/devel/pacman/src/pacman/.libs/lt-pacman -Rdd pacman' > [2012-12-20 16:29] [ALPM] warning: /etc/pacman.conf saved as /etc/pacman.conf.pacsave > [2012-12-20 16:29] [PACMAN] removed pacman (4.0.3-5) > [2012-12-20 16:29] [PACMAN] Running '/home/ag/devel/pacman/src/pacman/.libs/lt-pacman --conf /etc/pacman.conf.pacsave -S pacman' > [2012-12-20 16:29] [ALPM-SCRIPTLET] >>> Run `pacman-key --init; pacman-key --populate archlinux` > [2012-12-20 16:29] [ALPM-SCRIPTLET] >>> to import the data required by pacman for package verification. > [2012-12-20 16:29] [ALPM-SCRIPTLET] >>> See: https://www.archlinux.org/news/having-pacman-verify-packages > [2012-12-20 16:29] [PACMAN] installed pacman (4.0.3-5) Andrew Gregory (4): alpm_handle_t: add program name for use in log prefix _alpm_logaction: add support for prefix log.c: add alpm_plogaction pacman: set program name for logging lib/libalpm/add.c | 22 +++++++++++----------- lib/libalpm/alpm.c | 2 ++ lib/libalpm/alpm.h | 4 ++++ lib/libalpm/handle.c | 18 ++++++++++++++++++ lib/libalpm/handle.h | 1 + lib/libalpm/log.c | 50 ++++++++++++++++++++++++++++++++++++++------------ lib/libalpm/remove.c | 6 +++--- lib/libalpm/util.c | 8 ++++++-- lib/libalpm/util.h | 2 +- src/pacman/conf.c | 1 + 10 files changed, 85 insertions(+), 29 deletions(-) -- 1.8.0.2

3 14

[pacman-dev] [PATCH] Update "missing" file
by Allan McRae 23 Jan '13

23 Jan '13

The latest automake release causes complaints about an out of date 'missing' file during configure. Sync with upstream. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- build-aux/missing | 461 ++++++++++++++++++------------------------------------ 1 file changed, 150 insertions(+), 311 deletions(-) diff --git a/build-aux/missing b/build-aux/missing index 28055d2..cdea514 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ scriptversion=2009-04-28.21; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' -sed_minuso='s/.* -o $[^ ]*$.*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-automake(a)gnu.org>." exit $? @@ -100,272 +70,141 @@ Send bug reports to <bug-automake(a)gnu.org>." ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* $[^ ]*$ *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) -- 1.8.1.1

1 0

[pacman-dev] [PATCH] add doxygen comments to conflict.c
by Andrew Gregory 23 Jan '13

23 Jan '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/conflict.c | 94 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 0080e7c..610e5ad 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -40,6 +40,9 @@ #include "deps.h" #include "filelist.h" +/** + * @brief Creates a new conflict. + */ static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, alpm_depend_t *reason) { @@ -56,6 +59,9 @@ static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, return conflict; } +/** + * @brief Free a conflict and its members. + */ void _alpm_conflict_free(alpm_conflict_t *conflict) { FREE(conflict->package2); @@ -63,6 +69,9 @@ void _alpm_conflict_free(alpm_conflict_t *conflict) FREE(conflict); } +/** + * @brief Creates a copy of a conflict. + */ alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict) { alpm_conflict_t *newconflict; @@ -77,6 +86,14 @@ alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict) return newconflict; } +/** + * @brief Searches for a conflict in a list. + * + * @param needle conflict to search for + * @param haystack list of conflicts to search + * + * @return 1 if needle is in haystack, 0 otherwise + */ static int conflict_isin(alpm_conflict_t *needle, alpm_list_t *haystack) { alpm_list_t *i; @@ -93,12 +110,16 @@ static int conflict_isin(alpm_conflict_t *needle, alpm_list_t *haystack) return 0; } -/** Adds the pkg1/pkg2 conflict to the baddeps list. +/** + * @brief Adds the pkg1/pkg2 conflict to the baddeps list. + * * @param handle the context handle * @param baddeps list to add conflict to * @param pkg1 first package * @param pkg2 package causing conflict * @param reason reason for this conflict + * + * @return 0 on success, -1 on error */ static int add_conflict(alpm_handle_t *handle, alpm_list_t **baddeps, alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, alpm_depend_t *reason) @@ -119,11 +140,13 @@ static int add_conflict(alpm_handle_t *handle, alpm_list_t **baddeps, return 0; } -/** Check if packages from list1 conflict with packages from list2. - * This looks at the conflicts fields of all packages from list1, and sees - * if they match packages from list2. - * If a conflict (pkg1, pkg2) is found, it is added to the baddeps list - * in this order if order >= 0, or reverse order (pkg2,pkg1) otherwise. +/** + * @brief Check if packages from list1 conflict with packages from list2. + * + * @details This looks at the conflicts fields of all packages from list1, and + * sees if they match packages from list2. If a conflict (pkg1, pkg2) is found, + * it is added to the baddeps list in this order if order >= 0, or reverse + * order (pkg2,pkg1) otherwise. * * @param handle the context handle * @param list1 first list of packages @@ -169,7 +192,14 @@ static void check_conflict(alpm_handle_t *handle, } } -/* Check for inter-conflicts */ +/** + * @brief Check for inter-conflicts in a list of packages. + * + * @param handle the context handle + * @param packages list of packages to check + * + * @return list of conflicts + */ alpm_list_t *_alpm_innerconflicts(alpm_handle_t *handle, alpm_list_t *packages) { alpm_list_t *baddeps = NULL; @@ -180,7 +210,9 @@ alpm_list_t *_alpm_innerconflicts(alpm_handle_t *handle, alpm_list_t *packages) return baddeps; } -/* Check for target vs (db - target) conflicts */ +/** + * @brief Returns a list of conflicts between a db and a list of packages. + */ alpm_list_t *_alpm_outerconflicts(alpm_db_t *db, alpm_list_t *packages) { alpm_list_t *baddeps = NULL; @@ -202,10 +234,12 @@ alpm_list_t *_alpm_outerconflicts(alpm_db_t *db, alpm_list_t *packages) return baddeps; } -/** Check the package conflicts in a database +/** + * @brief Check the package conflicts in a database * * @param handle the context handle * @param pkglist the list of packages to check + * * @return an alpm_list_t of alpm_conflict_t */ alpm_list_t SYMEXPORT *alpm_checkconflicts(alpm_handle_t *handle, @@ -215,8 +249,16 @@ alpm_list_t SYMEXPORT *alpm_checkconflicts(alpm_handle_t *handle, return _alpm_innerconflicts(handle, pkglist); } -/* Adds alpm_fileconflict_t to a conflicts list. Pass the conflicts list, the - * conflicting file path, and either two packages or one package and NULL. +/** + * @brief Creates and adds a file conflict to a conflict list. + * + * @param handle the context handle + * @param conflicts the list of conflicts to append to + * @param filestr the conflicting file path + * @param pkg1 package that wishes to install the file + * @param pkg2 package that currently owns the file, or NULL if unowned + * + * @return the updated conflict list */ static alpm_list_t *add_fileconflict(alpm_handle_t *handle, alpm_list_t *conflicts, const char *filestr, @@ -245,6 +287,9 @@ error: RET_ERR(handle, ALPM_ERR_MEMORY, conflicts); } +/** + * @brief Frees a conflict and its members. + */ void _alpm_fileconflict_free(alpm_fileconflict_t *conflict) { FREE(conflict->ctarget); @@ -253,6 +298,17 @@ void _alpm_fileconflict_free(alpm_fileconflict_t *conflict) FREE(conflict); } +/** + * @brief Recursively checks if a package owns all subdirectories and files in + * a directory. + * + * @param handle the context handle + * @param dirpath path of the directory to check + * @param pkg package being checked against + * + * @return 1 if a package owns all subdirectories and files or a directory + * cannot be opened, 0 otherwise + */ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, alpm_pkg_t *pkg) { @@ -331,9 +387,19 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, return 1; } -/* Find file conflicts that may occur during the transaction with two checks: - * 1: check every target against every target - * 2: check every target against the filesystem */ +/** + * @brief Find file conflicts that may occur during the transaction. + * + * @details Performs two checks: + * 1. check every target against every target + * 2. check every target against the filesystem + * + * @param handle the context handle + * @param upgrade list of packages being installed + * @param rem list of packages being removed + * + * @return list of file conflicts + */ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_list_t *upgrade, alpm_list_t *rem) { -- 1.8.1.1

2 1

[pacman-dev] [PATCH 0/4] Redo path flexibility patches.
by Allan McRae 23 Jan '13

23 Jan '13

There was some concern about potential security implications of calling execvp and the ability to get a root shell. Good to see this was mentioned in the six months between the patches being sent to the mailing list and when they were committed (passive-agressive Allan!) All those patches are reverted (commits 4a8c2852, 993700bc, bb4d2b72, 60b192e3) in the first patch which is not being sent. Then the pactests are refixed only allowing full paths to the scriptlet shell and the path to ldconfig is made configurable. Allan McRae (4): Revert execvp and related commits pactest: handle non-default scriptlet shells Remove leading / for pactest paths Make path to ldconfig configurable Makefile.am | 1 + configure.ac | 16 +++++++++++++--- lib/libalpm/util.c | 17 ++++++++++------- test/pacman/pactest.py | 8 ++++++-- test/pacman/pmdb.py | 1 + test/pacman/pmenv.py | 1 + test/pacman/pmfile.py | 1 + test/pacman/pmpkg.py | 1 + test/pacman/pmrule.py | 1 + test/pacman/pmtest.py | 28 +++++++++------------------- test/pacman/tests/ldconfig001.py | 2 +- test/pacman/tests/ldconfig002.py | 2 +- test/pacman/tests/ldconfig003.py | 2 +- test/pacman/tests/sync700.py | 2 +- test/pacman/util.py | 1 + 15 files changed, 49 insertions(+), 35 deletions(-) -- 1.8.1.1

1 2

[pacman-dev] [PATCH] [paccache] Fix printing of paths
by William Giokas 21 Jan '13

21 Jan '13

Originally printed a leading \ before all path names as the `' would be removed during the make. Using '' should be just as good as using `'. paccache.sh.in: die "cachedir \`%s' does not exist or is not a directory" "$cachedir" paccache die "cachedir \%s does not exist or is not a directory" "$cachedir" Signed-off-by: William Giokas <1007380(a)gmail.com> --- contrib/paccache.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 15b7dff..dfac1cb 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -132,7 +132,7 @@ summarize() { if (( delete )); then printf -v output 'finished: %d packages removed' "$filecount" elif (( move )); then - printf -v output "finished: %d packages moved to \`%s'" "$filecount" "$movedir" + printf -v output "finished: %d packages moved to '%s'" "$filecount" "$movedir" elif (( dryrun )); then if (( verbose )); then msg "Candidate packages:" @@ -266,10 +266,10 @@ case $(( dryrun+delete+move )) in esac [[ -d $cachedir ]] || - die "cachedir \`%s' does not exist or is not a directory" "$cachedir" + die "cachedir '%s' does not exist or is not a directory" "$cachedir" [[ $movedir && ! -d $movedir ]] && - die "move-to directory \`%s' does not exist or is not a directory" "$movedir" + die "move-to directory '%s' does not exist or is not a directory" "$movedir" if (( move || delete )); then # make it an absolute path since we're about to chdir @@ -278,7 +278,7 @@ if (( move || delete )); then fi # unlikely that this will fail, but better make sure -cd "$cachedir" >/dev/null || die "failed to chdir to \`%s'" "$cachedir" +cd "$cachedir" >/dev/null || die "failed to chdir to '%s'" "$cachedir" # note that these results are returned in an arbitrary order from awk, but # they'll be resorted (in summarize) iff we have a verbosity level set. -- 1.8.1.1.250.geacf011

2 1

[pacman-dev] [PATCH 3/4] Remove leading / for pactest paths
by Allan McRae 20 Jan '13

20 Jan '13

The leading / makes the pactest suite look for the file in the users filesystem. This meant the ldconfig tests always passed (even when broken in pacman...). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/tests/ldconfig001.py | 2 +- test/pacman/tests/ldconfig002.py | 2 +- test/pacman/tests/ldconfig003.py | 2 +- test/pacman/tests/sync700.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/pacman/tests/ldconfig001.py b/test/pacman/tests/ldconfig001.py index a264326..a97f28c 100644 --- a/test/pacman/tests/ldconfig001.py +++ b/test/pacman/tests/ldconfig001.py @@ -6,4 +6,4 @@ self.args = "-U %s" % p.filename() self.addrule("PACMAN_RETCODE=0") -self.addrule("FILE_EXIST=/etc/ld.so.cache") +self.addrule("FILE_EXIST=etc/ld.so.cache") diff --git a/test/pacman/tests/ldconfig002.py b/test/pacman/tests/ldconfig002.py index 2628dc7..07f2ec6 100644 --- a/test/pacman/tests/ldconfig002.py +++ b/test/pacman/tests/ldconfig002.py @@ -10,4 +10,4 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-2") -self.addrule("FILE_EXIST=/etc/ld.so.cache") +self.addrule("FILE_EXIST=etc/ld.so.cache") diff --git a/test/pacman/tests/ldconfig003.py b/test/pacman/tests/ldconfig003.py index 8d1babb..9b2967e 100644 --- a/test/pacman/tests/ldconfig003.py +++ b/test/pacman/tests/ldconfig003.py @@ -6,4 +6,4 @@ self.args = "-S %s" % sp.name self.addrule("PACMAN_RETCODE=0") -self.addrule("FILE_EXIST=/etc/ld.so.cache") +self.addrule("FILE_EXIST=etc/ld.so.cache") diff --git a/test/pacman/tests/sync700.py b/test/pacman/tests/sync700.py index 0002b64..9748c81 100644 --- a/test/pacman/tests/sync700.py +++ b/test/pacman/tests/sync700.py @@ -17,6 +17,6 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_VERSION=pkg1|1.0-1") -self.addrule("FILE_EXIST=/lib/bar") +self.addrule("FILE_EXIST=lib/bar") self.expectfailure = True -- 1.8.1.1

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-512-gb27886a
by allan＠archlinux.org 17 Jan '13

17 Jan '13

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 b27886ab5967c30e2e80d46e47968c9f4a95e760 (commit) via 132e1ac10c7fef54372f4d8119b6cc3e82d2c957 (commit) via c628d649f6568fc2627c685add09fc4024e87e4b (commit) via 4a8c2852a887d2b1aaa43be3071ab586eb24b9e3 (commit) via 993700bc6b12cd291544d2a22845f480e8a7925e (commit) via bb4d2b72c1d35ab9d65d632be0dcaf00cfa7d600 (commit) via 60b192e3836a150eb6950ce52241efebbee00f11 (commit) from 9c160cf3f3cbda5fe5b6188e9e31775b71fc5bab (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 b27886ab5967c30e2e80d46e47968c9f4a95e760 Author: William Giokas <1007380(a)gmail.com> Date: Tue Jan 15 22:45:42 2013 -0600 makepkg: Formatting consistency in write_pkginfo The difference between the echo and the printf's in write_pkginfo seemed to be somewhat sporadic. Also, the INFAKEROOT check was doing the same exact thing as the SPLITPKG check, but formatted much differently and consuming two extra lines. I think this makes it more readable than it was previously, if nothing else. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 132e1ac10c7fef54372f4d8119b6cc3e82d2c957 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jan 15 21:10:04 2013 -0500 dload: avoid showing progress bars on some redirects RFC 2616 doesn't forbid a 301 or 302 repsonse from having a body, and servers exist in the wild that show this behavior. In order to prevent pacman from showing a progress bar when we aren't actually downloading a package (and merely following one of these pain in the butt redirects), capture the server response code in the response header, rather than waiting to peel it off the handle after the download has finished. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Reported-by: Alexandre Filgueira <alexfilgueira(a)cinnarch.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c628d649f6568fc2627c685add09fc4024e87e4b Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 11 09:17:24 2013 +1000 Fix release dates Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4a8c2852a887d2b1aaa43be3071ab586eb24b9e3 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Sep 20 23:09:29 2012 +1000 pmtest: resolve path to scriptlet shell In order to support a variety of values for the --with-scriptlet-shell configure flag, pmtest has to be aware of what kind of path was passed, be it an absolute path or a fragment for a path lookup. For absolute paths, leave the path alone. For fragments, search the PATH environment var for the resolved path to the binary. In both cases, join the resultant path to the root directory defined for the test, not a pre-determined bin directory. Fixes FS#31552. With-contribution-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 993700bc6b12cd291544d2a22845f480e8a7925e Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 11:39:58 2012 +1000 Do not require full path for scriptlet shell This increases robustness to the shell location changing paths. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bb4d2b72c1d35ab9d65d632be0dcaf00cfa7d600 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 11:26:31 2012 +1000 Do not use full path for ldconfig The ldconfig binary is not guaranteed to be in /sbin. Change to calling just "ldconfig" rather than using the full path. This removed the check that the ldconfig binary exists. However, it is a reasonable assumption that it will exist if its configuration file does. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 60b192e3836a150eb6950ce52241efebbee00f11 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 16 11:23:39 2012 +1000 Use execvp for running programs in chroot This makes us more robust to utilities changing paths. There is no functional change when a full path is specified. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 1 + configure.ac | 6 +++--- doc/index.txt | 4 ++-- lib/libalpm/dload.c | 21 ++++++++++++++++----- lib/libalpm/dload.h | 1 + lib/libalpm/util.c | 17 +++++++---------- scripts/makepkg.sh.in | 12 +++++------- test/pacman/pactest.py | 5 +++++ test/pacman/pmenv.py | 2 +- test/pacman/pmtest.py | 21 +++++++++++++++++++-- 10 files changed, 60 insertions(+), 30 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] [makepkg] Replace `echo`s with `printf`s
by William Giokas 16 Jan '13

16 Jan '13

I was writing up a patch adding in .SRCINFO files, and noticed that the write_pkginfo function had some pretty random uses of echo vs. printf, so I switched them all to printf, including in the help section for the sake of formatting. In write_pkginfo I also re-wrote the fakeroot check to be the same as the splitpkg check. Signed-off-by: William Giokas <1007380(a)gmail.com> --- scripts/makepkg.sh.in | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c057905..ef85dbe 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -125,7 +125,7 @@ trap_exit() { local signal=$1; shift if (( ! INFAKEROOT )); then - echo + printf "\n" error "$@" fi [[ -n $srclinks ]] && rm -rf "$srclinks" @@ -993,7 +993,7 @@ get_integlist() { local integlist=() for integ in md5 sha1 sha256 sha384 sha512; do - local integrity_sums=($(eval echo "\${${integ}sums[@]}")) + local integrity_sums=($(eval printf "\${${integ}sums[@]}\n")) if [[ -n "$integrity_sums" ]]; then integlist=(${integlist[@]} $integ) fi @@ -1064,10 +1064,10 @@ generate_checksums() { (( ct )) && printf "%s" "$indent" printf "%s" "'$sum'" ct=$(($ct+1)) - (( $ct < $numsrc )) && echo + (( $ct < $numsrc )) && printf "\n" done - echo ")" + printf ")\n" done } @@ -1078,7 +1078,7 @@ check_checksums() { local correlation=0 local integ required for integ in md5 sha1 sha256 sha384 sha512; do - local integrity_sums=($(eval echo "\${${integ}sums[@]}")) + local integrity_sums=($(eval printf "\${${integ}sums[@]}\n")) if (( ${#integrity_sums[@]} == ${#source[@]} )); then msg "$(gettext "Validating source files with %s...")" "${integ}sums" correlation=1 @@ -1091,7 +1091,7 @@ check_checksums() { printf "%s" " $file ... " >&2 if [[ ${integrity_sums[$idx]} = 'SKIP' ]]; then - echo "$(gettext "Skipped")" >&2 + printf "$(gettext "Skipped\n")" >&2 idx=$((idx + 1)) continue fi @@ -1713,14 +1713,12 @@ write_pkginfo() { size="$(( ${size%%[^0-9]*} * 1024 ))" msg2 "$(gettext "Generating %s file...")" ".PKGINFO" - echo "# Generated by makepkg $makepkg_version" - if (( INFAKEROOT )); then - echo "# using $(fakeroot -v)" - fi - echo "# $(LC_ALL=C date -u)" + printf "# Generated by makepkg %s\n" "$makepkg_version" + (( INFAKEROOT )) && printf "# using %S\n" "$(fakeroot -v)" + printf "# %s\n" "$(LC_ALL=C date -u)" printf "pkgname = %s\n" "$pkgname" - (( SPLITPKG )) && echo pkgbase = $pkgbase - echo "pkgver = $(get_full_version)" + (( SPLITPKG )) && printf "pkgbase = %s\n" "$pkgbase" + printf "pkgver = %s\n" "$(get_full_version)" printf "pkgdesc = %s\n" "${pkgdesc//+([[:space:]])/ }" printf "url = %s\n" "$url" printf "builddate = %s\n" "$builddate" @@ -2396,9 +2394,9 @@ m4_include(library/parseopts.sh) usage() { printf "makepkg (pacman) %s\n" "$makepkg_version" - echo + printf "\n" printf -- "$(gettext "Usage: %s [options]")\n" "$0" - echo + printf "\n" printf -- "$(gettext "Options:")\n" printf -- "$(gettext " -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT" printf -- "$(gettext " -c, --clean Clean up work files after build")\n" @@ -2429,16 +2427,16 @@ usage() { printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" printf -- "$(gettext " --skipinteg Do not perform any verification checks on source files")\n" printf -- "$(gettext " --skippgpcheck Do not verify source files with PGP signatures")\n" - echo + printf "\n" printf -- "$(gettext "These options can be passed to %s:")\n" "pacman" - echo + printf "\n" printf -- "$(gettext " --asdeps Install packages as non-explicitly installed")\n" printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" printf -- "$(gettext " --needed Do not reinstall the targets that are already up to date")\n" printf -- "$(gettext " --noprogressbar Do not show a progress bar when downloading files")\n" - echo + printf "\n" printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT" - echo + printf "\n" } version() { -- 1.8.1.336.g94702dd

2 2

[pacman-dev] [PATCH] dload: avoid showing progress bars on some redirects
by Dave Reisner 16 Jan '13

16 Jan '13

RFC 2616 doesn't forbid a 301 or 302 repsonse from having a body, and servers exist in the wild that show this behavior. In order to prevent pacman from showing a progress bar when we aren't actually downloading a package (and merely following one of these pain in the butt redirects), capture the server response code in the response header, rather than waiting to peel it off the handle after the download has finished. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Reported-by: Alexandre Filgueira <alexfilgueira(a)cinnarch.com> --- lib/libalpm/dload.c | 21 ++++++++++++++++----- lib/libalpm/dload.h | 1 + 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index ee19adb..83d2051 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -96,6 +96,11 @@ static int dload_progress_cb(void *file, double dltotal, double dlnow, struct dload_payload *payload = (struct dload_payload *)file; off_t current_size, total_size; + /* avoid displaying progress bar for redirects with a body */ + if(payload->respcode >= 300) { + return 0; + } + /* SIGINT sent, abort by alerting curl */ if(dload_interrupted) { return 1; @@ -199,6 +204,7 @@ static size_t dload_parseheader_cb(void *ptr, size_t size, size_t nmemb, void *u const char * const cd_header = "Content-Disposition:"; const char * const fn_key = "filename="; struct dload_payload *payload = (struct dload_payload *)user; + long respcode; if(_alpm_raw_ncmp(cd_header, ptr, strlen(cd_header)) == 0) { if((fptr = strstr(ptr, fn_key))) { @@ -220,6 +226,11 @@ static size_t dload_parseheader_cb(void *ptr, size_t size, size_t nmemb, void *u } } + curl_easy_getinfo(payload->handle->curl, CURLINFO_RESPONSE_CODE, &respcode); + if(payload->respcode != respcode) { + payload->respcode = respcode; + } + return realsize; } @@ -383,7 +394,7 @@ static int curl_download_internal(struct dload_payload *payload, char hostname[HOSTNAME_SIZE]; char error_buffer[CURL_ERROR_SIZE] = {0}; struct stat st; - long timecond, respcode = 0, remote_time = -1; + long timecond, remote_time = -1; double remote_size, bytes_dl; struct sigaction orig_sig_pipe, orig_sig_int; /* shortcut to our handle within the payload */ @@ -463,13 +474,12 @@ static int curl_download_internal(struct dload_payload *payload, switch(payload->curlerr) { case CURLE_OK: /* get http/ftp response code */ - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &respcode); - _alpm_log(handle, ALPM_LOG_DEBUG, "response code: %ld\n", respcode); - if(respcode >= 400) { + _alpm_log(handle, ALPM_LOG_DEBUG, "response code: %ld\n", payload->respcode); + if(payload->respcode >= 400) { payload->unlink_on_fail = 1; /* non-translated message is same as libcurl */ snprintf(error_buffer, sizeof(error_buffer), - "The requested URL returned error: %ld", respcode); + "The requested URL returned error: %ld", payload->respcode); _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), payload->remote_name, hostname, error_buffer); @@ -725,6 +735,7 @@ void _alpm_dload_payload_reset(struct dload_payload *payload) FREE(payload->destfile_name); FREE(payload->content_disp_name); FREE(payload->fileurl); + memset(payload, '\0', sizeof(*payload)); } /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index ca17200..70e3479 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -42,6 +42,7 @@ struct dload_payload { #ifdef HAVE_LIBCURL CURLcode curlerr; /* last error produced by curl */ #endif + long respcode; }; void _alpm_dload_payload_reset(struct dload_payload *payload); -- 1.8.1.1

1 0