- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] move prevprogress onto payload handle
by Dave Reisner 29 Sep '11

29 Sep '11

This is a poor place for it, and it will likely move again in the future, but it's better to have it here than as a static variable. Initialization of this variable is now no longer necessary as its zeroed on creation of the payload struct. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/dload.c | 11 +++-------- lib/libalpm/dload.h | 1 + 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 1e8db1e..d53187b 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -43,8 +43,6 @@ #include "handle.h" #ifdef HAVE_LIBCURL -static off_t prevprogress; /* last download amount */ - static const char *get_filename(const char *url) { char *filename = strrchr(url, '/'); @@ -103,19 +101,19 @@ static int curl_progress(void *file, double dltotal, double dlnow, total_size = payload->initial_size + (off_t)dltotal; - if(DOUBLE_EQ(dltotal, 0.0) || prevprogress == total_size) { + if(DOUBLE_EQ(dltotal, 0.0) || payload->prevprogress == total_size) { return 0; } /* initialize the progress bar here to avoid displaying it when * a repo is up to date and nothing gets downloaded */ - if(prevprogress == 0) { + if(payload->prevprogress == 0) { payload->handle->dlcb(payload->remote_name, 0, (off_t)dltotal); } payload->handle->dlcb(payload->remote_name, current_size, total_size); - prevprogress = current_size; + payload->prevprogress = current_size; return 0; } @@ -367,9 +365,6 @@ static int curl_download_internal(struct dload_payload *payload, mask_signal(SIGPIPE, SIG_IGN, &orig_sig_pipe); mask_signal(SIGINT, &inthandler, &orig_sig_int); - /* Progress 0 - initialize */ - prevprogress = 0; - /* perform transfer */ handle->curlerr = curl_easy_perform(handle->curl); diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 765c5fd..8a2dbc6 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -35,6 +35,7 @@ struct dload_payload { char *fileurl; off_t initial_size; off_t max_size; + off_t prevprogress; int force; int allow_resume; int errors_ok; -- 1.7.6.4

1 0

[pacman-dev] [PATCH 1/3] paccache: allow strictly integer for -k option
by lolilolicon 29 Sep '11

29 Sep '11

Verify the argument to -k is a non-negative integer. Leading zeros are simply tripped. 'declare -i keep' allowed the argument to -k to be any arithmetic evaluation expression. The simple assignment 'keep=$OPTARG' triggers arithmetic evaluation implicitly, which can either consume a huge amount of resources with input such as '2**2**32' or immediately produce an error on invalid input. Instead, we simply 'declare -- keep' and avoid all that. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- contrib/paccache.in | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/paccache.in b/contrib/paccache.in index 11b7bbb..7c35cf2 100755 --- a/contrib/paccache.in +++ b/contrib/paccache.in @@ -21,8 +21,8 @@ shopt -s extglob declare -a candidates=() cmdopts=() whitelist=() blacklist=() -declare -i delete=0 dryrun=0 filecount=0 keep=3 move=0 totalsaved=0 -declare cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' movedir= scanarch= +declare -i delete=0 dryrun=0 filecount=0 move=0 totalsaved=0 +declare cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' keep=3 movedir= scanarch= msg() { local mesg=$1; shift @@ -220,8 +220,10 @@ while getopts ':a:c:dfhi:k:m:rsuvz' opt; do blacklist+=("${ign[@]}") unset i ign ;; k) keep=$OPTARG - if [[ $keep != $OPTARG ]] || (( keep < 0 )); then + if [[ -z $keep || -n ${keep//[0-9]/} ]]; then die 'argument to option -k must be a non-negative integer' + else + keep=$(( 10#$keep )) fi ;; m) move=1 movedir=$OPTARG ;; r) delete=1 ;; -- 1.7.6.4

2 4

[pacman-dev] [PATCH 3/3] paccache: verify nonnegative integer for -k option
by lolilolicon 28 Sep '11

28 Sep '11

Allow leading zeros, but always treat it as decimal. Also quote right side of [[ expression ]] when the != or == operator is used, unless a pattern is intended. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- contrib/paccache.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/paccache.in b/contrib/paccache.in index 11b7bbb..c86ea31 100755 --- a/contrib/paccache.in +++ b/contrib/paccache.in @@ -153,7 +153,7 @@ summarize() { while read -r pkg; do if (( verbose >= 3 )); then [[ $pkg =~ $pkg_re ]] && name=${BASH_REMATCH[1]} arch=${BASH_REMATCH[2]} - if [[ -z $seen || $seenarch != $arch || $seen != $name ]]; then + if [[ -z $seen || $seenarch != "$arch" || $seen != "$name" ]]; then printf '%s (%s):\n' "$name" "$arch" fi printf ' %s\n' "$pkg" @@ -220,8 +220,10 @@ while getopts ':a:c:dfhi:k:m:rsuvz' opt; do blacklist+=("${ign[@]}") unset i ign ;; k) keep=$OPTARG - if [[ $keep != $OPTARG ]] || (( keep < 0 )); then + if [[ -z $keep || -n ${keep//[0-9]/} ]]; then die 'argument to option -k must be a non-negative integer' + else + keep=$(( 10#$keep )) fi ;; m) move=1 movedir=$OPTARG ;; r) delete=1 ;; -- 1.7.6.4

2 3

[pacman-dev] [PATCH 2/3] pkgdelta: clean up quoting
by lolilolicon 28 Sep '11

28 Sep '11

Always quote the righthand side of expression when the == or != operator is used, unless intended as a pattern. Also, remove unnecessary quoting in variable assignments. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- scripts/pkgdelta.sh.in | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index a0e3cee..c53098a 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -85,25 +85,25 @@ create_xdelta() deltafile read_pkginfo "$oldfile" || return 1 - oldname="$pkgname" - oldver="$pkgver" - oldarch="$arch" + oldname=$pkgname + oldver=$pkgver + oldarch=$arch read_pkginfo "$newfile" || return 1 - newname="$pkgname" - newver="$pkgver" - newarch="$arch" + newname=$pkgname + newver=$pkgver + newarch=$arch - if [[ $oldname != $newname ]]; then + if [[ $oldname != "$newname" ]]; then error "$(gettext "The package names don't match : '%s' and '%s'")" "$oldname" "$newname" return 1 fi - if [[ $oldarch != $newarch ]]; then + if [[ $oldarch != "$newarch" ]]; then error "$(gettext "The package architectures don't match : '%s' and '%s'")" "$oldarch" "$newarch" return 1 fi - if [[ $oldver == $newver ]]; then + if [[ $oldver == "$newver" ]]; then error "$(gettext "Both packages have the same version : '%s'")" "$newver" return 1 fi -- 1.7.6.4

4 6

[pacman-dev] [PATCH 1/3] makepkg: proper quoting in [[ expression ]]
by lolilolicon 28 Sep '11

28 Sep '11

Always quote the righthand side of expression when the == or != operator is used, unless intended as a pattern. Quoting bash(1): When the == and != operators are used, the string to the right of the operator is considered a pattern. Any part of the pattern may be quoted to force it to be matched as a string. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- scripts/makepkg.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 86e74a6..cc06baa 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -414,7 +414,7 @@ download_file() { fi # rename the temporary download file to the final destination - if [[ $dlfile != $file ]]; then + if [[ $dlfile != "$file" ]]; then mv -f "$SRCDEST/$dlfile" "$SRCDEST/$file" fi } @@ -1509,7 +1509,7 @@ check_sanity() { eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | \ sed -e "s/provides=/provides_list+=/" -e "s/#.*//" -e 's/\\$//') for i in ${provides_list[@]}; do - if [[ $i != ${i//</} || $i != ${i//>/} ]]; then + if [[ $i == *['<>']* ]]; then error "$(gettext "%s array cannot contain comparison (< or >) operators.")" "provides" ret=1 fi @@ -1767,7 +1767,7 @@ devel_update() { # _foo=pkgver # if [[ -n $newpkgver ]]; then - if [[ $newpkgver != $pkgver ]]; then + if [[ $newpkgver != "$pkgver" ]]; then if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" -- 1.7.6.4

3 3

[pacman-dev] [PATCH 1/3] Initialize cURL library on first use
by Dan McGee 28 Sep '11

28 Sep '11

Rather than always initializing it on any handle creation. There are several frontend operations (search, info, etc.) that never need the download code, so spending time initializing this every single time is a bit silly. This makes it a bit more like the GPGME code init path. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.c | 5 --- lib/libalpm/dload.c | 77 ++++++++++++++++++++++++++++---------------------- lib/libalpm/dload.h | 1 + lib/libalpm/handle.h | 1 - 4 files changed, 44 insertions(+), 40 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 772c84d..3884334 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -78,11 +78,6 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, bindtextdomain("libalpm", LOCALEDIR); #endif -#ifdef HAVE_LIBCURL - curl_global_init(CURL_GLOBAL_SSL); - myhandle->curl = curl_easy_init(); -#endif - return myhandle; cleanup: diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 1e8db1e..dbf7a8c 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -66,6 +66,15 @@ static char *get_fullpath(const char *path, const char *filename, return filepath; } +static CURL *get_libcurl_handle(alpm_handle_t *handle) +{ + if(!handle->curl) { + curl_global_init(CURL_GLOBAL_SSL); + handle->curl = curl_easy_init(); + } + return handle->curl; +} + enum { ABORT_SIGINT = 1, ABORT_OVER_MAXFILESIZE @@ -201,7 +210,7 @@ static size_t parse_headers(void *ptr, size_t size, size_t nmemb, void *user) } static void curl_set_handle_opts(struct dload_payload *payload, - char *error_buffer) + CURL *curl, char *error_buffer) { alpm_handle_t *handle = payload->handle; const char *useragent = getenv("HTTP_USER_AGENT"); @@ -209,47 +218,46 @@ static void curl_set_handle_opts(struct dload_payload *payload, /* the curl_easy handle is initialized with the alpm handle, so we only need * to reset the handle's parameters for each time it's used. */ - curl_easy_reset(handle->curl); - curl_easy_setopt(handle->curl, CURLOPT_URL, payload->fileurl); - curl_easy_setopt(handle->curl, CURLOPT_FAILONERROR, 1L); - curl_easy_setopt(handle->curl, CURLOPT_ERRORBUFFER, error_buffer); - curl_easy_setopt(handle->curl, CURLOPT_CONNECTTIMEOUT, 10L); - curl_easy_setopt(handle->curl, CURLOPT_FILETIME, 1L); - curl_easy_setopt(handle->curl, CURLOPT_NOPROGRESS, 0L); - curl_easy_setopt(handle->curl, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(handle->curl, CURLOPT_PROGRESSFUNCTION, curl_progress); - curl_easy_setopt(handle->curl, CURLOPT_PROGRESSDATA, (void *)payload); - curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_LIMIT, 1024L); - curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_TIME, 10L); - curl_easy_setopt(handle->curl, CURLOPT_HEADERFUNCTION, parse_headers); - curl_easy_setopt(handle->curl, CURLOPT_WRITEHEADER, (void *)payload); - curl_easy_setopt(handle->curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); + curl_easy_reset(curl); + curl_easy_setopt(curl, CURLOPT_URL, payload->fileurl); + curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); + curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer); + curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L); + curl_easy_setopt(curl, CURLOPT_FILETIME, 1L); + curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, curl_progress); + curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *)payload); + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1024L); + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 10L); + curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, parse_headers); + curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)payload); + curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); _alpm_log(handle, ALPM_LOG_DEBUG, "url: %s\n", payload->fileurl); if(payload->max_size) { _alpm_log(handle, ALPM_LOG_DEBUG, "maxsize: %jd\n", (intmax_t)payload->max_size); - curl_easy_setopt(handle->curl, CURLOPT_MAXFILESIZE_LARGE, + curl_easy_setopt(curl, CURLOPT_MAXFILESIZE_LARGE, (curl_off_t)payload->max_size); } if(useragent != NULL) { - curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, useragent); + curl_easy_setopt(curl, CURLOPT_USERAGENT, useragent); } if(!payload->allow_resume && !payload->force && payload->destfile_name && stat(payload->destfile_name, &st) == 0) { /* start from scratch, but only download if our local is out of date. */ - curl_easy_setopt(handle->curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); - curl_easy_setopt(handle->curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); + curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); + curl_easy_setopt(curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); _alpm_log(handle, ALPM_LOG_DEBUG, "using time condition: %lu\n", (long)st.st_mtime); } else if(stat(payload->tempfile_name, &st) == 0 && payload->allow_resume) { /* a previous partial download exists, resume from end of file. */ payload->tempfile_openmode = "ab"; - curl_easy_setopt(handle->curl, CURLOPT_RESUME_FROM_LARGE, - (curl_off_t)st.st_size); + curl_easy_setopt(curl, CURLOPT_RESUME_FROM_LARGE, (curl_off_t)st.st_size); _alpm_log(handle, ALPM_LOG_DEBUG, "tempfile found, attempting continuation from %jd bytes\n", (intmax_t)st.st_size); @@ -319,6 +327,7 @@ static int curl_download_internal(struct dload_payload *payload, struct sigaction orig_sig_pipe, orig_sig_int; /* shortcut to our handle within the payload */ alpm_handle_t *handle = payload->handle; + CURL *curl = get_libcurl_handle(handle); handle->pm_errno = 0; payload->tempfile_openmode = "wb"; @@ -347,7 +356,7 @@ static int curl_download_internal(struct dload_payload *payload, } } - curl_set_handle_opts(payload, error_buffer); + curl_set_handle_opts(payload, curl, error_buffer); if(localf == NULL) { localf = fopen(payload->tempfile_name, payload->tempfile_openmode); @@ -360,7 +369,7 @@ static int curl_download_internal(struct dload_payload *payload, "opened tempfile for download: %s (%s)\n", payload->tempfile_name, payload->tempfile_openmode); - curl_easy_setopt(handle->curl, CURLOPT_WRITEDATA, localf); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, localf); /* ignore any SIGPIPE signals- these may occur if our FTP socket dies or * something along those lines. Store the old signal handler first. */ @@ -371,16 +380,16 @@ static int curl_download_internal(struct dload_payload *payload, prevprogress = 0; /* perform transfer */ - handle->curlerr = curl_easy_perform(handle->curl); + payload->curlerr = curl_easy_perform(curl); /* immediately unhook the progress callback */ - curl_easy_setopt(handle->curl, CURLOPT_NOPROGRESS, 1L); + curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L); /* was it a success? */ - switch(handle->curlerr) { + switch(payload->curlerr) { case CURLE_OK: /* get http/ftp response code */ - curl_easy_getinfo(handle->curl, CURLINFO_RESPONSE_CODE, &respcode); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &respcode); if(respcode >=400) { payload->unlink_on_fail = 1; goto cleanup; @@ -389,7 +398,7 @@ static int curl_download_internal(struct dload_payload *payload, case CURLE_ABORTED_BY_CALLBACK: /* handle the interrupt accordingly */ if(dload_interrupted == ABORT_OVER_MAXFILESIZE) { - handle->curlerr = CURLE_FILESIZE_EXCEEDED; + payload->curlerr = CURLE_FILESIZE_EXCEEDED; handle->pm_errno = ALPM_ERR_LIBCURL; /* the hardcoded 'size exceeded' message is same as libcurl's normal */ _alpm_log(handle, ALPM_LOG_ERROR, @@ -416,11 +425,11 @@ static int curl_download_internal(struct dload_payload *payload, } /* retrieve info about the state of the transfer */ - curl_easy_getinfo(handle->curl, CURLINFO_FILETIME, &remote_time); - curl_easy_getinfo(handle->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &remote_size); - curl_easy_getinfo(handle->curl, CURLINFO_SIZE_DOWNLOAD, &bytes_dl); - curl_easy_getinfo(handle->curl, CURLINFO_CONDITION_UNMET, &timecond); - curl_easy_getinfo(handle->curl, CURLINFO_EFFECTIVE_URL, &effective_url); + curl_easy_getinfo(curl, CURLINFO_FILETIME, &remote_time); + curl_easy_getinfo(curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &remote_size); + curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &bytes_dl); + curl_easy_getinfo(curl, CURLINFO_CONDITION_UNMET, &timecond); + curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url); /* time condition was met and we didn't download anything. we need to * clean up the 0 byte .part file that's left behind. */ diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 765c5fd..c2fd609 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -39,6 +39,7 @@ struct dload_payload { int allow_resume; int errors_ok; int unlink_on_fail; + CURLcode curlerr; /* last error produced by curl */ }; void _alpm_dload_payload_free(struct dload_payload *payload); diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index b1d70d2..8477dca 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -60,7 +60,6 @@ struct __alpm_handle_t { #ifdef HAVE_LIBCURL /* libcurl handle */ CURL *curl; /* reusable curl_easy handle */ - CURLcode curlerr; /* last error produced by curl */ #endif /* callback functions */ -- 1.7.6.4

1 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc2-33-ga8ed39c
by dan＠archlinux.org 28 Sep '11

28 Sep '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 a8ed39ce05b68f5c9f0e29d86bf9bb0ac81b0ffd (commit) from 6f3a657f66b9c766b5fa6c51c26283d3547f5169 (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 a8ed39ce05b68f5c9f0e29d86bf9bb0ac81b0ffd Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 10:26:48 2011 -0500 verbose package lists: remove errant debugger Left this in as part of the last set of commits, whoops. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/util.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc2-32-g6f3a657
by dan＠archlinux.org 28 Sep '11

28 Sep '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 6f3a657f66b9c766b5fa6c51c26283d3547f5169 (commit) via bcc6a5d72df3cb3ee9f3d2347526c3dc03d5f55a (commit) via 1b8bb7c1cd81c1f8f0dcffc952cd464b6a436f06 (commit) via f682cbd43355daa7b13389d74e0ffea0370ba89b (commit) via 7edeb276b63efeea7e8f266dfee792e2709ba412 (commit) via bd83c8e7562a2d6794d4322845c23cc21985979a (commit) via 40a264478e65c652f863b3e43b0fc8aa10f0bd19 (commit) via 6e081a0c57f0f6f14428f7cb78bb22f6848fe4af (commit) via 98e0371ae38d748fb04cec4759addb54e3a618ea (commit) via f66f9f11cd010a05efe28d0607abbf29ff8dffa5 (commit) via ea3c47825ea6a8cfd0e0d63fd7da0120fcacabc8 (commit) via 69962184bb3cc313f744de6553ef31b4eb256a01 (commit) via d8fab9b4415b2382c9b5d92f6d0d40074ab65f30 (commit) via bf56fb6eb82b732900c32cbf375f7910ac479d98 (commit) via 619c3629ca61cea2c182fcb0197f9b84ba4209c3 (commit) from e70d540501d718583a8e4b91ca5989af3f3db77d (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 6f3a657f66b9c766b5fa6c51c26283d3547f5169 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 04:46:22 2011 -0500 Always show download size if -w/--downloadonly was provided The prompt can be rather confusing otherwise when all files have already been downloaded, but there is not a single total size listed. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bcc6a5d72df3cb3ee9f3d2347526c3dc03d5f55a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 12 21:25:58 2011 -0400 Table format creation code cleanup Better scoping of variables for the most part, and ensure we are using string_length() and not strlen() as appropriate. Also refactor the longest cell code to call string_length() a lot less; by simply using an array of max sizes we don't have to recompute values nearly as much. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1b8bb7c1cd81c1f8f0dcffc952cd464b6a436f06 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 09:44:15 2011 -0500 Use unsigned types for indent width and column count For getcols(), the functions we call return a value of type 'unsigned short', so it makes sense for us to do the same. string_length() is meant to behave like strlen(), so it should return type size_t. This exposes other functions such as indentprint() which should also be using signed return types. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f682cbd43355daa7b13389d74e0ffea0370ba89b Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 12 20:44:15 2011 -0400 Show download sizes when using -S/--sync We now label the old 'Size' column as 'Net Change' to reflect the reality of what we are looking at. Sync operations now get an additional 'Download Size' column. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7edeb276b63efeea7e8f266dfee792e2709ba412 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 29 15:35:59 2011 -0500 Keep track of explicitly added and removed packages This allows us to sort the output list by showing all pulled dependencies first, followed by the explicitly specified targets. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bd83c8e7562a2d6794d4322845c23cc21985979a Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 22 12:01:58 2011 -0500 Combine add and removal package list display There was no real reason for these to be done separately. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 40a264478e65c652f863b3e43b0fc8aa10f0bd19 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 01:53:43 2011 -0500 Track unresolvable transaction packages Rather than free them right away, keep the list on the transaction as we already do with add and remove lists. This is necessary because we may be manipulating pointers the frontend needs to refer to packages, and we are breaking our contract as stated in the alpm_add_pkg() documentation of only freeing packages at the end of a transaction. This fixes an issue found when refactoring the package list display code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6e081a0c57f0f6f14428f7cb78bb22f6848fe4af Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 04:45:30 2011 -0500 Move pacsave path construction code off the stack This is definitely not in the normal hot path, so we can afford to do some temporary heap allocation here. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 98e0371ae38d748fb04cec4759addb54e3a618ea Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 04:06:43 2011 -0500 Use the full buffer when computing md5/sha256 sums No wonder these were slower than expected. We were only reading 4 (32-bit) or 8 (64-bit) bytes at a time and feeding it to the hash functions. Define a buffer size constant and use it correctly so we feed 8K at a time into the hashing algorithm. This cut one larger `-Sw --noconfirm` operation, with nothing to actually download so only timing integrity, from 3.3s to 1.7s. This has been broken since the original commit eba521913d6 introducing OpenSSL usage for crypto hash functions. Boy do I feel stupid. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f66f9f11cd010a05efe28d0607abbf29ff8dffa5 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 02:56:36 2011 -0500 Fix memory leak in download payload->remote_name In the sync code, we explicitly allocated a string for this field, while in the dload code itself it was filled in with a pointer to another string. This led to a memory leak in the sync download case. Make remote_name non-const and always explicitly allocate it. This patch ensures this as well as uses malloc + snprintf (rather than calloc) in several codepaths, and eliminates the only use of PATH_MAX in the download code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ea3c47825ea6a8cfd0e0d63fd7da0120fcacabc8 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 27 20:24:04 2011 -0500 Revert "libalpm: compare pkgname with strcoll" This commit was made with the intent of displaying "correctly" sorted package lists to users. Here are some reasons I think this is incorrect: * It is done in the wrong place. If a frontend application wants to show a different order of packages dependent on locale, it should do that on its own. * Even if one wants a locale-specific order, almost all package names are all ASCII and language agnostic, so this different comparison makes little sense and may serve only to confuse people. * _alpm_pkg_cmp was unlike any other comparator function. None of the rest had any dependency on anything but the content of the structs being compared (e.g., they only used strcmp() or other basic comparison operators). This reverts commit 3e4d2c3aa65416487939148828afb385de2ee146. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 69962184bb3cc313f744de6553ef31b4eb256a01 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 27 17:47:40 2011 -0500 _alpm_splitdep: use malloc instead of calloc There was only one simple to handle case where we left a field uninitialized; set it to NULL and use malloc() instead. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d8fab9b4415b2382c9b5d92f6d0d40074ab65f30 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 27 17:36:31 2011 -0500 be_sync: fetch only entry mode, not full stat struct This saves a lot of unnecessary work since we don't need any of the other fields in the stat struct. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bf56fb6eb82b732900c32cbf375f7910ac479d98 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 27 16:14:17 2011 -0500 alpm_list: use malloc instead of calloc In every case we were calling calloc, the struct we allocated (or the memory to be used) is fully specified later in the method. For alpm_list_t allocations, we always set all of data, next, and prev. For list copying and transforming to an array, we always copy the entire data element, so no need to zero it first. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 619c3629ca61cea2c182fcb0197f9b84ba4209c3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 27 11:27:54 2011 -0400 makepkg: ensure '-' is last in a character glob If '-' isn't the last item, it's interpreted as a range and not literally, causing problematic behavior in parsing optdepends. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm_list.c | 8 +- lib/libalpm/be_sync.c | 7 +- lib/libalpm/deps.c | 8 +- lib/libalpm/dload.c | 26 +++-- lib/libalpm/dload.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/pkghash.c | 8 +- lib/libalpm/remove.c | 8 +- lib/libalpm/sync.c | 21 ++-- lib/libalpm/trans.c | 3 + lib/libalpm/trans.h | 5 +- lib/libalpm/util.c | 10 +- scripts/makepkg.sh.in | 3 +- src/pacman/callback.c | 4 +- src/pacman/conf.c | 4 +- src/pacman/conf.h | 3 + src/pacman/remove.c | 12 +- src/pacman/sync.c | 6 +- src/pacman/upgrade.c | 1 + src/pacman/util.c | 284 ++++++++++++++++++++++++++++++----------------- src/pacman/util.h | 12 ++- 21 files changed, 277 insertions(+), 160 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Use the full buffer when computing md5/sha256 sums
by Dan McGee 28 Sep '11

28 Sep '11

No wonder these were slower than expected. We were only reading 4 (32-bit) or 8 (64-bit) bytes at a time and feeding it to the hash functions. Define a buffer size constant and use it correctly so we feed 8K at a time into the hashing algorithm. This cut one larger `-Sw --noconfirm` operation, with nothing to actually download so only timing integrity, from 3.3s to 1.7s. This has been broken since the original commit eba521913d6 introducing OpenSSL usage for crypto hash functions. Boy do I feel stupid. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index a15eb96..18d1c36 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -741,6 +741,8 @@ int _alpm_lstat(const char *path, struct stat *buf) } #ifdef HAVE_LIBSSL +#define BUFFER_SIZE 8192 + static int md5_file(const char *path, unsigned char output[16]) { FILE *f; @@ -748,7 +750,7 @@ static int md5_file(const char *path, unsigned char output[16]) MD5_CTX ctx; unsigned char *buf; - CALLOC(buf, 8192, sizeof(unsigned char), return 1); + CALLOC(buf, BUFFER_SIZE, sizeof(unsigned char), return 1); if((f = fopen(path, "rb")) == NULL) { free(buf); @@ -757,7 +759,7 @@ static int md5_file(const char *path, unsigned char output[16]) MD5_Init(&ctx); - while((n = fread(buf, 1, sizeof(buf), f)) > 0) { + while((n = fread(buf, 1, BUFFER_SIZE, f)) > 0) { MD5_Update(&ctx, buf, n); } @@ -783,7 +785,7 @@ static int sha2_file(const char *path, unsigned char output[32], int is224) SHA256_CTX ctx; unsigned char *buf; - CALLOC(buf, 8192, sizeof(unsigned char), return 1); + CALLOC(buf, BUFFER_SIZE, sizeof(unsigned char), return 1); if((f = fopen(path, "rb")) == NULL) { free(buf); @@ -796,7 +798,7 @@ static int sha2_file(const char *path, unsigned char output[32], int is224) SHA256_Init(&ctx); } - while((n = fread(buf, 1, sizeof(buf), f)) > 0) { + while((n = fread(buf, 1, BUFFER_SIZE, f)) > 0) { if(is224) { SHA224_Update(&ctx, buf, n); } else { -- 1.7.6.4

1 0

[pacman-dev] [PATCH] Fix memory leak in download payload->remote_name
by Dan McGee 28 Sep '11

28 Sep '11

In the sync code, we explicitly allocated a string for this field, while in the dload code itself it was filled in with a pointer to another string. This led to a memory leak in the sync download case. Make remote_name non-const and always explicitly allocate it. This patch ensures this as well as uses malloc + snprintf (rather than calloc) in several codepaths, and eliminates the only use of PATH_MAX in the download code. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/dload.c | 26 ++++++++++++++++---------- lib/libalpm/dload.h | 2 +- lib/libalpm/sync.c | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 6f0139d..1e8db1e 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -60,7 +60,7 @@ static char *get_fullpath(const char *path, const char *filename, char *filepath; /* len = localpath len + filename len + suffix len + null */ size_t len = strlen(path) + strlen(filename) + strlen(suffix) + 1; - CALLOC(filepath, len, sizeof(char), return NULL); + MALLOC(filepath, len, return NULL); snprintf(filepath, len, "%s%s%s", path, filename, suffix); return filepath; @@ -279,22 +279,27 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat { int fd; FILE *fp; - char randpath[PATH_MAX]; - alpm_handle_t *handle = payload->handle; + char *randpath; + size_t len; /* create a random filename, which is opened with O_EXCL */ - snprintf(randpath, PATH_MAX, "%salpmtmp.XXXXXX", localpath); + len = strlen(localpath) + 14 + 1; + MALLOC(randpath, len, RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL)); + snprintf(randpath, len, "%salpmtmp.XXXXXX", localpath); if((fd = mkstemp(randpath)) == -1 || !(fp = fdopen(fd, payload->tempfile_openmode))) { unlink(randpath); close(fd); - _alpm_log(handle, ALPM_LOG_ERROR, + _alpm_log(payload->handle, ALPM_LOG_ERROR, _("failed to create temporary file for download\n")); return NULL; } /* fp now points to our alpmtmp.XXXXXX */ - STRDUP(payload->tempfile_name, randpath, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - payload->remote_name = strrchr(randpath, '/') + 1; + free(payload->tempfile_name); + payload->tempfile_name = randpath; + free(payload->remote_name); + STRDUP(payload->remote_name, strrchr(randpath, '/') + 1, + RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL)); return fp; } @@ -318,7 +323,7 @@ static int curl_download_internal(struct dload_payload *payload, payload->tempfile_openmode = "wb"; if(!payload->remote_name) { - payload->remote_name = get_filename(payload->fileurl); + payload->remote_name = strdup(get_filename(payload->fileurl)); } if(!payload->remote_name || curl_gethost(payload->fileurl, hostname) != 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("url '%s' is invalid\n"), payload->fileurl); @@ -591,10 +596,11 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) void _alpm_dload_payload_free(struct dload_payload *payload) { ASSERT(payload, return); - FREE(payload->fileurl); - FREE(payload->content_disp_name); + FREE(payload->remote_name); FREE(payload->tempfile_name); FREE(payload->destfile_name); + FREE(payload->content_disp_name); + FREE(payload->fileurl); FREE(payload); } diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index bc5eb13..765c5fd 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -27,8 +27,8 @@ struct dload_payload { alpm_handle_t *handle; - const char *remote_name; const char *tempfile_openmode; + char *remote_name; char *tempfile_name; char *destfile_name; char *content_disp_name; diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 04ea7d2..8c50ec8 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -874,7 +874,7 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas) /* print server + filename into a buffer */ len = strlen(server_url) + strlen(payload->remote_name) + 2; - CALLOC(payload->fileurl, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + MALLOC(payload->fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); snprintf(payload->fileurl, len, "%s/%s", server_url, payload->remote_name); payload->handle = handle; payload->allow_resume = 1; -- 1.7.6.4

1 0