- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix broken output when asking question and stdin is piped (FS#27909)
by Olivier Brunel 12 Jan '12

12 Jan '12

When asking question and stdin is piped, the response does not get printed out, resulting in a missing \n and broken output (FS#27909); printing the response fixes it. Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- src/pacman/util.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 2d88bac..876a15b 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1429,6 +1429,13 @@ static int question(short preset, char *fmt, va_list args) if(len == 0) { return preset; } + + /* if stdin is piped, response does not get printed out, and as a result + * a \n is missing, resulting in broken output (FS#27909) */ + struct stat sb; + if (fstat(STDIN_FILENO, &sb) == 0 && S_ISFIFO(sb.st_mode)) { + fprintf(stream, "%s\n", response); + } if(strcasecmp(response, _("Y")) == 0 || strcasecmp(response, _("YES")) == 0) { return 1; -- 1.7.8.3

4 6

[pacman-dev] [PATCH] repo-add: clean up help messages
by Dan McGee 12 Jan '12

12 Jan '12

Use consistent blank lines across all commands, get rid of the translated double newlines which only serve to confuse translators, and fix -h/--help for that extra special third command this script offers. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 28339e6..cfff102 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -48,30 +48,38 @@ usage() { printf "%s (pacman) %s\n\n" "$cmd" "$myver" if [[ $cmd == "repo-add" ]] ; then printf "$(gettext "Usage: repo-add [options] <path-to-db> <package|delta> ...\n")" + printf "\n" printf "$(gettext "\ repo-add will update a package database by reading a package file.\n\ -Multiple packages to add can be specified on the command line.\n\n")" +Multiple packages to add can be specified on the command line.\n")" + printf "\n" printf "$(gettext "Options:\n")" printf "$(gettext " -d, --delta generate and add delta for package update\n")" printf "$(gettext " -f, --files update database's file list\n")" elif [[ $cmd == "repo-remove" ]] ; then - printf "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\n\n")" + printf "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\n")" + printf "\n" printf "$(gettext "\ repo-remove will update a package database by removing the package name\n\ specified on the command line from the given repo database. Multiple\n\ -packages to remove can be specified on the command line.\n\n")" +packages to remove can be specified on the command line.\n")" + printf "\n" printf "$(gettext "Options:\n")" + else + printf "$(gettext "Please move along, there is nothing to see here.\n")" + return fi printf "$(gettext " -q, --quiet minimize output\n")" printf "$(gettext " -s, --sign sign database with GnuPG after update\n")" printf "$(gettext " -k, --key <key> use the specified key to sign the database\n")" printf "$(gettext " -v, --verify verify database's signature before update\n")" printf "$(gettext "\n\ -See %s(8) for more details and descriptions of the available options.\n\n")" $cmd +See %s(8) for more details and descriptions of the available options.\n")" $cmd + printf "\n" if [[ $cmd == "repo-add" ]] ; then - echo "$(gettext "Example: repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz")" + printf "$(gettext "Example: repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\n")" elif [[ $cmd == "repo-remove" ]] ; then - echo "$(gettext "Example: repo-remove /path/to/repo.db.tar.gz kernel26")" + printf "$(gettext "Example: repo-remove /path/to/repo.db.tar.gz kernel26\n")" fi } -- 1.7.8.3

1 0

[pacman-dev] [PATCH] Use fileno() in isatty() call
by Dan McGee 12 Jan '12

12 Jan '12

This was our only use of the function that had a hardcoded file descriptor. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/pacman.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 326664d..bce73d2 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -801,7 +801,7 @@ int main(int argc, char *argv[]) config = config_new(); /* disable progressbar if the output is redirected */ - if(!isatty(1)) { + if(!isatty(fileno(stdout))) { config->noprogressbar = 1; } -- 1.7.8.3

3 2

[pacman-dev] [PATCH] Allow UseDelta option to specify a delta ratio
by Dan McGee 12 Jan '12

12 Jan '12

Rework the frontend and backend to allow passing a ratio value in for UseDelta rather than having a hardcoded #define-d 0.7 value always used. This is useful for those with fast connections, who would likely benefit from tuning this ratio to lower values; it is also useful for general testing purposes. The libalpm API changes for this, but we do support the old config file format with a no-value 'UseDelta' option; in this case we simply use the old default of 0.7. We clamp the ratio values to a sane range between 0.0 and 2.0, allowing ratios above 1.0 for testing purposes. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/pacman.conf.5.txt | 10 +++++++--- etc/pacman.conf.in | 2 +- lib/libalpm/alpm.h | 4 ++-- lib/libalpm/delta.c | 3 ++- lib/libalpm/delta.h | 3 --- lib/libalpm/handle.c | 12 ++++++++---- lib/libalpm/handle.h | 2 +- lib/libalpm/sync.c | 4 ++-- src/pacman/conf.c | 19 ++++++++++++++++--- src/pacman/conf.h | 2 +- 10 files changed, 40 insertions(+), 21 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 2c1a24b..3913292 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -168,9 +168,13 @@ Options Log action messages through syslog(). This will insert log entries into +{localstatedir}/log/messages+ or equivalent. -*UseDelta*:: - Download delta files instead of complete packages if possible. Requires - the xdelta3 program to be installed. +*UseDelta* [= ratio]:: + Download delta files instead of complete packages if possible. Requires + the `xdelta3` program to be installed. If a ratio is specified (e.g., + `0.5`), then it is used as a cutoff for determining whether to use deltas. + Allowed values are between `0.0` and `2.0`; sensible values are between + `0.2` and `0.9`. Using a value above `1.0` is not recommended. The + default is `0.7` if left unspecified. *TotalDownload*:: When downloading, display the amount downloaded, download rate, ETA, diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 932140f..7f9db1b 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -20,6 +20,7 @@ SyncFirst = pacman #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled +#UseDelta = 0.7 Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup @@ -31,7 +32,6 @@ Architecture = auto # Misc options #UseSyslog -#UseDelta #TotalDownload CheckSpace #VerbosePkgLists diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 95c817e..9ffdebc 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -535,8 +535,8 @@ const char *alpm_option_get_arch(alpm_handle_t *handle); /** Sets the targeted architecture. */ int alpm_option_set_arch(alpm_handle_t *handle, const char *arch); -int alpm_option_get_usedelta(alpm_handle_t *handle); -int alpm_option_set_usedelta(alpm_handle_t *handle, int usedelta); +double alpm_option_get_deltaratio(alpm_handle_t *handle); +int alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio); int alpm_option_get_checkspace(alpm_handle_t *handle); int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 726f03c..e3acc66 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -264,7 +264,8 @@ static alpm_list_t *find_unused(alpm_list_t *deltas, const char *to, off_t quota alpm_list_t SYMEXPORT *alpm_pkg_unused_deltas(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); - return find_unused(pkg->deltas, pkg->filename, pkg->size * MAX_DELTA_RATIO); + return find_unused(pkg->deltas, pkg->filename, + pkg->size * pkg->handle->deltaratio); } /** @} */ diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index 1173ddf..37f208b 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -30,9 +30,6 @@ alpm_delta_t *_alpm_delta_dup(const alpm_delta_t *delta); off_t _alpm_shortest_delta_path(alpm_handle_t *handle, alpm_list_t *deltas, const char *to, alpm_list_t **path); -/* max percent of package size to download deltas */ -#define MAX_DELTA_RATIO 0.7 - #endif /* _ALPM_DELTA_H */ /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 8e2e3c7..2187dca 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -43,6 +43,7 @@ alpm_handle_t *_alpm_handle_new(void) alpm_handle_t *handle; CALLOC(handle, 1, sizeof(alpm_handle_t), return NULL); + handle->deltaratio = 0.0; return handle; } @@ -252,10 +253,10 @@ const char SYMEXPORT *alpm_option_get_arch(alpm_handle_t *handle) return handle->arch; } -int SYMEXPORT alpm_option_get_usedelta(alpm_handle_t *handle) +double SYMEXPORT alpm_option_get_deltaratio(alpm_handle_t *handle) { CHECK_HANDLE(handle, return -1); - return handle->usedelta; + return handle->deltaratio; } int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle) @@ -597,10 +598,13 @@ int SYMEXPORT alpm_option_set_arch(alpm_handle_t *handle, const char *arch) return 0; } -int SYMEXPORT alpm_option_set_usedelta(alpm_handle_t *handle, int usedelta) +int SYMEXPORT alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio) { CHECK_HANDLE(handle, return -1); - handle->usedelta = usedelta; + if(ratio < 0.0 || ratio > 2.0) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } + handle->deltaratio = ratio; return 0; } diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index a64c5c9..a090ae4 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -88,8 +88,8 @@ struct __alpm_handle_t { /* options */ char *arch; /* Architecture of packages we should allow */ + double deltaratio; /* Download deltas if possible; a ratio value */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ - int usedelta; /* Download deltas if possible */ int checkspace; /* Check disk space before installing */ alpm_siglevel_t siglevel; /* Default signature verification level */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 49a3f42..6967b49 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -318,13 +318,13 @@ static int compute_download_size(alpm_pkg_t *newpkg) /* tell the caller that we have a partial */ ret = 1; - } else if(handle->usedelta) { + } else if(handle->deltaratio > 0.0) { off_t dltsize; dltsize = _alpm_shortest_delta_path(handle, newpkg->deltas, newpkg->filename, &newpkg->delta_path); - if(newpkg->delta_path && (dltsize < newpkg->size * MAX_DELTA_RATIO)) { + if(newpkg->delta_path && (dltsize < newpkg->size * handle->deltaratio)) { _alpm_log(handle, ALPM_LOG_DEBUG, "using delta size\n"); size = dltsize; } else { diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 7ba2791..e1bff18 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -52,6 +52,7 @@ config_t *config_new(void) newconfig->op = PM_OP_MAIN; newconfig->logmask = ALPM_LOG_ERROR | ALPM_LOG_WARNING; newconfig->configfile = strdup(CONFFILE); + newconfig->deltaratio = 0.0; if(alpm_capabilities() & ALPM_CAPABILITY_SIGNATURES) { newconfig->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL | ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; @@ -397,8 +398,8 @@ static int _parse_options(const char *key, char *value, config->verbosepkglists = 1; pm_printf(ALPM_LOG_DEBUG, "config: verbosepkglists\n"); } else if(strcmp(key, "UseDelta") == 0) { - config->usedelta = 1; - pm_printf(ALPM_LOG_DEBUG, "config: usedelta\n"); + config->deltaratio = 0.7; + pm_printf(ALPM_LOG_DEBUG, "config: usedelta (default 0.7)\n"); } else if(strcmp(key, "TotalDownload") == 0) { config->totaldownload = 1; pm_printf(ALPM_LOG_DEBUG, "config: totaldownload\n"); @@ -429,6 +430,18 @@ static int _parse_options(const char *key, char *value, if(!config->arch) { config_set_arch(value); } + } else if(strcmp(key, "UseDelta") == 0) { + double ratio; + char *endptr; + ratio = strtod(value, &endptr); + if(*endptr != '\0' || ratio < 0.0 || ratio > 2.0) { + pm_printf(ALPM_LOG_ERROR, + _("config file %s, line %d: invalid value for '%s' : '%s'\n"), + file, linenum, "UseDelta", value); + return 1; + } + config->deltaratio = ratio; + pm_printf(ALPM_LOG_DEBUG, "config: usedelta = %f\n", ratio); } else if(strcmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { @@ -605,7 +618,7 @@ static int setup_libalpm(void) alpm_option_set_arch(handle, config->arch); alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); - alpm_option_set_usedelta(handle, config->usedelta); + alpm_option_set_deltaratio(handle, config->deltaratio); alpm_option_set_ignorepkgs(handle, config->ignorepkg); alpm_option_set_ignoregroups(handle, config->ignoregrp); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 325fbb6..481132f 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -34,7 +34,7 @@ typedef struct __config_t { unsigned short print; unsigned short checkspace; unsigned short usesyslog; - unsigned short usedelta; + double deltaratio; char *arch; char *print_format; /* unfortunately, we have to keep track of paths both here and in the library -- 1.7.8.3

3 2

[pacman-dev] [PATCH 1/2] skip unneeded parsing
by jjacky 11 Jan '12

11 Jan '12

parsing config file is a two-steps process, one for "options" and one for the repos. in each of those, there's no need to parse the other section(s), so we'll skip it. (most notably, when parsing for "options" it would read all included files for repos, while just ignoring everything in them) Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- src/pacman/conf.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 7ba2791..09749ea 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -755,6 +755,12 @@ static int _parseconfig(const char *file, struct section_t *section, continue; } + /* skip unnecessary parsing */ + if ( (parse_options && !section->is_options) + || (!parse_options && section->is_options) ) { + continue; + } + /* directive */ /* strsep modifies the 'line' string: 'key \0 value' */ key = line; -- 1.7.8.3

3 9

[pacman-dev] [PATCH] Moved the check for max depth
by jjacky 10 Jan '12

10 Jan '12

Moved the check for max depth when processing an Include directive, to avoid doing the glob process for nothing. Added file & line number in max depth error message. Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- src/pacman/conf.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 09749ea..2ff16d2 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -700,13 +700,6 @@ static int _parseconfig(const char *file, struct section_t *section, int ret = 0; const int max_depth = 10; - if(depth >= max_depth) { - pm_printf(ALPM_LOG_ERROR, - _("config parsing exceeded max recursion depth of %d.\n"), max_depth); - ret = 1; - goto cleanup; - } - pm_printf(ALPM_LOG_DEBUG, "config: attempting to read file %s\n", file); fp = fopen(file, "r"); if(fp == NULL) { @@ -794,6 +787,16 @@ static int _parseconfig(const char *file, struct section_t *section, ret = 1; goto cleanup; } + + /* if we've reached max depth, we're done */ + if(depth + 1 >= max_depth) { + pm_printf(ALPM_LOG_ERROR, + _("config file %s, line %d: parsing exceeded max recursion depth of %d.\n"), + file, linenum, max_depth); + ret = 1; + goto cleanup; + } + /* Ignore include failures... assume non-critical */ globret = glob(value, GLOB_NOCHECK, NULL, &globbuf); switch(globret) { -- 1.7.8.3

1 0

[pacman-dev] [PATCH] updpkgsums: add new contrib script
by Dave Reisner 10 Jan '12

10 Jan '12

updpkgsums updates checksums in a PKGBUILD "in place" --- This is really a whole lot of sanity checking and very little actual noise, but given what this script does (deleting a file), I chose to err on the side of extreme caution. I remembered to add to .gitignore this time! contrib/.gitignore | 1 + contrib/Makefile.am | 5 ++- contrib/updpkgsums.in | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 1 deletions(-) create mode 100755 contrib/updpkgsums.in diff --git a/contrib/.gitignore b/contrib/.gitignore index 19b81e0..4f8e1e7 100644 --- a/contrib/.gitignore +++ b/contrib/.gitignore @@ -7,5 +7,6 @@ paclog-pkglist pacscripts pacsearch pacsysclean +updpkgsums wget-xdelta.sh zsh_completion diff --git a/contrib/Makefile.am b/contrib/Makefile.am index eca39e7..fab8d7c 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -12,7 +12,8 @@ OURSCRIPTS = \ paclog-pkglist \ pacscripts \ pacsearch \ - pacsysclean + pacsysclean \ + updpkgsums OURFILES = \ bash_completion \ @@ -29,6 +30,7 @@ EXTRA_DIST = \ pacscripts.in \ pacsearch.in \ pacsysclean.in \ + updpkgsums.in \ vimprojects \ zsh_completion.in \ README @@ -84,6 +86,7 @@ pacscripts: $(srcdir)/pacscripts.in pacsearch: $(srcdir)/pacsearch.in pacsysclean: $(srcdir)/pacsysclean.in pactree: $(srcdir)/pactree.in +updpkgsums: $(srcdir)/updpkgsums.in zsh_completion: $(srcdir)/zsh_completion.in # vim:set ts=2 sw=2 noet: diff --git a/contrib/updpkgsums.in b/contrib/updpkgsums.in new file mode 100755 index 0000000..304f5db --- /dev/null +++ b/contrib/updpkgsums.in @@ -0,0 +1,90 @@ +#!/bin/bash +# +# updpkgsums - update source checksums in-place in PKGBUILDs +# +# Copyright (C) 2012 Dave Reisner <dreisner(a)archlinux.org> +# +# 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 the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +shopt -s extglob + +declare -r myname='updpkgsums' +declare -r myver='@PACKAGE_VERSION@' + +usage() { + printf 'usage: %s [buildfile]\n\n' "$myname" + printf ' -h, --help display this help message and exit\n' + printf ' -V, --version display version information and exit\n\n' + printf '%s will perform an in place update the checksums in the\n' "$myname" + printf 'path specified by [buildfile], defaulting to PKGBUILD in the current\n' + printf 'working directory.\n' +} + +version() { + printf "%s %s\n" "$myname" "$myver" + echo 'Copyright (C) 2012 Dave Reisner <dreisner(a)archlinux.org>' +} + +case $1 in + -h|--help) usage; exit ;; + -V|--version) version; exit ;; +esac + +buildfile=${1:-PKGBUILD} +if [[ ! -f $buildfile ]]; then + printf $'==> ERROR: \`%s\' not found or is not a file: %s\n' "$buildfile" + exit 1 +fi + +# Resolve any symlinks to avoid replacing the symlink with a file. But, we +# have to do this portably... readlink's flags are inconsistent across OS's. +while [[ -L $buildfile ]]; do + buildfile=$(readlink "$buildfile") + cd "${buildfile%/*}" + buildfile=${buildfile##*/} +done + +# cd into the directory with the build file. this avoids creating random src/ +# directories scattered about the filesystem, and avoids cases where we might +# not be able to write in the $PWD. +if [[ $buildfile == */* ]]; then + cd "${buildfile%/*}" + buildfile=${buildfile##*/} +fi + +# check $PWD/ for permission to unlink the $buildfile and write a new one +if [[ ! -w . ]]; then + printf $'==> ERROR: No write permission in `%s\'\n' "$PWD" + exit 1 +fi + +{ + # Generate the new sums and try to unlink the file before writing stdin back + # into it. This final precaution shouldn't fail based on the previous checks, + # but it's better to be extra careful before unlinking files. + newsums=$(makepkg -g -p "$buildfile") && rm -f "$buildfile" && + exec awk -v newsums="$newsums" ' + /^[[:blank:]]*(md|sha)[[:digit:]]+sums=/,/\)[[:blank:]]*(#.*)?$/ { + if (!w) { + print newsums + w++ + } + next + } + + 1 + ' > "$buildfile" +} < "$buildfile" + +# vim: set ts=2 sw=2 noet: -- 1.7.8.3

1 1

[pacman-dev] [PATCH 2/2] Only create string when needed (libalpm)
by jjacky 09 Jan '12

09 Jan '12

The entry's name is only used when not "." or ".." so only print the string then. Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- lib/libalpm/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index e2cbd8c..4245039 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -427,8 +427,8 @@ int _alpm_rmrf(const char *path) } for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { - sprintf(name, "%s/%s", path, dp->d_name); if(strcmp(dp->d_name, "..") != 0 && strcmp(dp->d_name, ".") != 0) { + sprintf(name, "%s/%s", path, dp->d_name); errflag += _alpm_rmrf(name); } } -- 1.7.8.3

1 0

[pacman-dev] [PATCH 1/2] only create string when needed
by jjacky 09 Jan '12

09 Jan '12

The entry's name is only used when not "." or ".." so only print the string then. (I'm guessing enormous speed improvements right there... :p) Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- src/pacman/util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 467bedf..2d88bac 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -191,9 +191,9 @@ int rmrf(const char *path) } for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { - char name[PATH_MAX]; - sprintf(name, "%s/%s", path, dp->d_name); if(strcmp(dp->d_name, "..") != 0 && strcmp(dp->d_name, ".") != 0) { + char name[PATH_MAX]; + snprintf(name, PATH_MAX, "%s/%s", path, dp->d_name); errflag += rmrf(name); } } -- 1.7.8.3

1 0

[pacman-dev] [PATCH 2/2] only create string when needed
by jjacky 09 Jan '12

09 Jan '12

the entry's name is only used when not "." or ".." so only print the string then. (i'm guessing enormous speed improvements right there... :p) Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- src/pacman/util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 467bedf..2d88bac 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -191,9 +191,9 @@ int rmrf(const char *path) } for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { - char name[PATH_MAX]; - sprintf(name, "%s/%s", path, dp->d_name); if(strcmp(dp->d_name, "..") != 0 && strcmp(dp->d_name, ".") != 0) { + char name[PATH_MAX]; + snprintf(name, PATH_MAX, "%s/%s", path, dp->d_name); errflag += rmrf(name); } } -- 1.7.8.3

2 2