- Pacman-dev - lists.archlinux.org

[pacman-dev] Errors while KDE 4.6 upgrading
by Sergej Pupykin 27 Jan '11

27 Jan '11

Hi, Why pacman think that file is corrupted when I do -Syu and does not think so when I do -U ... ? $ pacman -Syu ..... :: File kde-meta-kdeadmin-4.6-1.2-any.pkg.tar.xz is corrupted. Do you want to delete it? [Y/n] n :: File kde-meta-kdeartwork-4.6-1.2-any.pkg.tar.xz is corrupted. Do you want to delete it? [Y/n] n :: File kde-meta-kdebase-4.6-1.2-any.pkg.tar.xz is corrupted. Do you want to delete it? [Y/n] n :: File kde-meta-kdeedu-4.6-1.2-any.pkg.tar.xz is corrupted. Do you want to delete it? [Y/n] n :: File kde-meta-kdegames-4.6-1.2-any.pkg.tar.xz is corrupted. Do you want to delete it? [Y/n] n :: File kde-meta-kdegraphics-4.6-1.2-any.pkg.tar.xz is corrupted. Do you want to delete it? [Y/n] n error: failed to commit transaction (invalid or corrupted package) kde-meta-kdeadmin-4.6-1.2-any.pkg.tar.xz is invalid or corrupted kde-meta-kdeartwork-4.6-1.2-any.pkg.tar.xz is invalid or corrupted kde-meta-kdebase-4.6-1.2-any.pkg.tar.xz is invalid or corrupted kde-meta-kdeedu-4.6-1.2-any.pkg.tar.xz is invalid or corrupted kde-meta-kdegames-4.6-1.2-any.pkg.tar.xz is invalid or corrupted kde-meta-kdegraphics-4.6-1.2-any.pkg.tar.xz is invalid or corrupted $ pacman -U /var/cache/pacman/pkg/kde-meta-kdeadmin-4.6-1.2-any.pkg.tar.xz ...... Proceed with installation? [Y/n] checking package integrity... (1/1) checking for file conflicts [###########################################] 100% (1/1) upgrading kde-meta-kdeadmin [###########################################] 100%

4 3

Re: [pacman-dev] Errors while KDE 4.6 upgrading
by Ionuț Bîru 27 Jan '11

27 Jan '11

On 01/27/2011 12:37 PM, Andrea Scarpino wrote: > On Thursday 27 January 2011 13:28:24 Sergej Pupykin wrote: >> Why pacman think that file is corrupted when I do -Syu and does not >> think so when I do -U ... ? > Because I rebuilt them and re-added them (there are no changes). Clean your > cache to fix this. > remember what i said about pacman 3.4 that would extract only the difference between databases? bump pkgrel every time you rebuild. pacman -Syy should fix his issue -- Ionuț

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-281-gfe76c35
by dan＠archlinux.org 25 Jan '11

25 Jan '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 fe76c353af6d91ce9f225dc2b0195a689f6790da (commit) via 0f24390fe8967f25d7fce4665d5b635fa66a3c4f (commit) via d6a997ee383a8228a0f5bf18af56febb7b6bc189 (commit) from 27e8f06e0335ca560a3d0a261cc1979dbc1caad9 (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 fe76c353af6d91ce9f225dc2b0195a689f6790da Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 24 21:46:42 2011 -0600 Fix memory leak and error code in DB reading We were returning a package error code rather than a DB one, and we would leak the archive memory if the database file didn't exist. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0f24390fe8967f25d7fce4665d5b635fa66a3c4f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 24 15:20:10 2011 -0600 pkgsearch: handle non-matching lines gracefully Before any non-matching line would trigger some perl warnings about undefined variables. If a line doesn't match, just show it to the user unprocessed; this is seen with warning and error messages pacman not so helpfully emits on stdout rather than stderr. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d6a997ee383a8228a0f5bf18af56febb7b6bc189 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 24 15:19:14 2011 -0600 Update contrib/ Makefile We didn't have the proper dependencies specified for our scripts after the move to *.in extensions, so a change to a file didn't trigger a rebuild. Also remove old stuff from .gitignore. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/.gitignore | 1 - contrib/Makefile.am | 10 ++++++++++ contrib/pacsearch.in | 12 +++++++++--- lib/libalpm/be_sync.c | 5 +++-- 4 files changed, 22 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Robson Peixoto invited you to Dropbox
by Dropbox 24 Jan '11

24 Jan '11

Robson Peixoto wants you to use Dropbox to sync and share files online and across computers. Get started here: http://www.dropbox.com/link/20.Ud2UoA8Uk3/NjYxNDQ4MDkyNw?src=referrals_ab_b… - The Dropbox Team ____________________________________________________ To stop receiving invites from Dropbox, please go to http://www.dropbox.com/bl/359c9af48b34/pacman-dev%40archlinux.org

6 6

[pacman-dev] [PATCH] Add interactive provider selection
by Xavier Chantry 23 Jan '11

23 Jan '11

If there are multiple providers in one db, pacman used to just stop at the first one (both during dependency resolution or for pacman -S 'provision' which uses the same code). This adds a new conversation callback so that the user can choose which provider to install. By default (user press enter or --noconfirm), the first provider is still chosen, so for example the behavior of sync402 and 403 is preserved. But at least the user now has the possibility to make the right choice in a manual run. $ pacman -S community/smtp-server :: There are 3 providers available for smtp-server: 1) courier-mta 2) esmtp 3) exim Which one do you want to install? Enter a number (default=1): Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- lib/libalpm/alpm.h | 1 + lib/libalpm/deps.c | 28 +++++++++++++++++++++- src/pacman/callback.c | 13 ++++++++++ src/pacman/util.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/util.h | 2 + 5 files changed, 103 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 237e235..d9e5439 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -379,6 +379,7 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_CORRUPTED_PKG = (1 << 3), PM_TRANS_CONV_LOCAL_NEWER = (1 << 4), PM_TRANS_CONV_REMOVE_PKGS = (1 << 5), + PM_TRANS_CONV_SELECT_PROVIDER = (1 << 6), } pmtransconv_t; /* Transaction Progress */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index cdaf524..f94f16c 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -510,6 +510,10 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, { alpm_list_t *i, *j; int ignored = 0; + + alpm_list_t *providers = NULL; + int count; + /* 1. literals */ for(i = dbs; i; i = i->next) { pmpkg_t *pkg = _alpm_db_get_pkgfromcache(i->data, dep->name); @@ -549,11 +553,31 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, continue; } } - _alpm_log(PM_LOG_WARNING, _("provider package was selected (%s provides %s)\n"), - pkg->name, dep->name); + _alpm_log(PM_LOG_DEBUG, "provider found (%s provides %s)\n", + pkg->name, dep->name); + providers = alpm_list_add(providers, pkg); + /* keep looking for other providers in the current db */ + } + } + /* if there is more than one provider, we ask the user */ + count = alpm_list_count(providers); + if(count == 1) { + pmpkg_t *pkg = alpm_list_getdata(alpm_list_first(providers)); + alpm_list_free(providers); + return(pkg); + } else if(count > 1) { + /* default to first provider if there is no QUESTION callback */ + int index = 0; + QUESTION(handle->trans, PM_TRANS_CONV_SELECT_PROVIDER, + providers, dep, NULL, &index); + if(index >= 0 && index < count) { + pmpkg_t *pkg = alpm_list_getdata(alpm_list_nth(providers, index)); + alpm_list_free(providers); return(pkg); } } + alpm_list_free(providers); + providers = NULL; } if(ignored) { /* resolvedeps will override these */ pm_errno = PM_ERR_PKG_IGNORED; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 32dafb5..f54fe4a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -296,6 +296,19 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, alpm_list_free(namelist); } break; + case PM_TRANS_CONV_SELECT_PROVIDER: + { + alpm_list_t *providers = (alpm_list_t *)data1; + int count = alpm_list_count(providers); + char *depstring = alpm_dep_compute_string((pmdepend_t *)data2); + printf(_(":: There are %d providers available for %s:\n"), count, + depstring); + free(depstring); + select_display(providers); + printf("\n"); + *response = select_question(count, _("Which one do you want to install?")); + } + break; case PM_TRANS_CONV_LOCAL_NEWER: if(!config->op_s_downloadonly) { *response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"), diff --git a/src/pacman/util.c b/src/pacman/util.c index 5b4b2e8..0af36b4 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -686,6 +686,67 @@ void display_optdepends(pmpkg_t *pkg) } } +void select_display(const alpm_list_t *pkglist) +{ + const alpm_list_t *i; + int nth = 1; + alpm_list_t *list = NULL; + char *string = NULL; + + for (i = pkglist; i; i = i->next) { + string = NULL; + pm_asprintf(&string, "%d) %s", nth, alpm_pkg_get_name(i->data)); + list = alpm_list_add(list, string); + nth++; + } + list_display(" ", list); + FREELIST(list); +} + +int select_question(int count, char *fmt, ...) +{ + char response[32]; + FILE *stream; + va_list args; + int preset = 1; + + if(config->noconfirm) { + stream = stdout; + } else { + /* Use stderr so questions are always displayed when redirecting output */ + stream = stderr; + } + + va_start(args, fmt); + vfprintf(stream, fmt, args); + va_end(args); + + fprintf(stream, "\n"); + fprintf(stream, _("Enter a number (default=%d)"), preset); + fprintf(stream, ": "); + + if(config->noconfirm) { + fprintf(stream, "\n"); + return(preset-1); + } + + if(fgets(response, sizeof(response), stdin)) { + strtrim(response); + if(strlen(response) > 0) { + char *endptr = NULL; + int n = strtol(response, &endptr, 10); + if(*endptr == '\0' && n >= 1 && n <= count) { + return(n-1); + } else { + fprintf(stream, _("Invalid number: %s\n"), response); + return(-1); + } + } + } + return(preset-1); +} + + /* presents a prompt and gets a Y/N answer */ static int question(short preset, char *fmt, va_list args) { diff --git a/src/pacman/util.h b/src/pacman/util.h index 2e77b0c..7e25b55 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -58,6 +58,8 @@ void display_targets(const alpm_list_t *pkgs, int install); void display_new_optdepends(pmpkg_t *oldpkg, pmpkg_t *newpkg); void display_optdepends(pmpkg_t *pkg); void print_packages(const alpm_list_t *packages); +void select_display(const alpm_list_t *pkglist); +int select_question(int count, char *fmt, ...); int yesno(char *fmt, ...); int noyes(char *fmt, ...); int pm_printf(pmloglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); -- 1.7.3.1

4 8

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-278-g27e8f06
by dan＠archlinux.org 22 Jan '11

22 Jan '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 27e8f06e0335ca560a3d0a261cc1979dbc1caad9 (commit) via 4d291508c2c24d058d0e00ca9588c6c81b24bc92 (commit) via d16a5ae7ddf358c45280a56bc81ed67841a7476f (commit) via 6e71922e6c918de9b60d2e9b1585835421738437 (commit) via a99e7272b8703e54b3c96ac0fdb7fe7eacfabbe8 (commit) via b3d71bf7d0ef8f577114bc39abecdc7ade0395dd (commit) via cda7d7847f3434959ef077ec6eb78ea4b2078a5a (commit) via c91bd3dda9540bb80f9e73fed87eee69b4675977 (commit) via 61864e1f6f51549c3b32c0d82b8c9deacea3ed73 (commit) from 32727efc38bf5376a402c4c4149cc4148ba2068b (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 27e8f06e0335ca560a3d0a261cc1979dbc1caad9 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 14:29:02 2011 -0600 Query fileowner performance improvements Clean up some of the code by doing less string copying and printing. This is accomplished by either doing it after we know we need it, or taking advantage of the fact that some strings never change such as the root directory prefix. Also, fix an issue where a file at the root level (e.g. /foobar) could not be queried. End result is a much faster user experience when combined with the mbasename() changes. These timings are for looking up 113 files in /etc/, some of which are owned and some which are not. $ find /etc -maxdepth 1 -type f | xargs time pacman -Qo >/dev/null 6.10user 0.05system 0:06.17elapsed 99%CPU (0avgtext+0avgdata 131040maxresident)k 0inputs+0outputs (0major+9436minor)pagefaults 0swaps $ find /etc -maxdepth 1 -type f | xargs time ./src/pacman/.libs/lt-pacman -Qo >/dev/null 0.86user 0.04system 0:00.92elapsed 99%CPU (0avgtext+0avgdata 131120maxresident)k 0inputs+0outputs (0major+9436minor)pagefaults 0swaps I'll take a 600% increase in speed. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4d291508c2c24d058d0e00ca9588c6c81b24bc92 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 14:20:42 2011 -0600 Improve mbasename performance Rather than roll our own, use strrchr() instead, which glibc may have a better implementation than the simple iteration method we were using. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d16a5ae7ddf358c45280a56bc81ed67841a7476f Merge: 6e71922 cda7d78 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 16:32:34 2011 -0600 Merge branch 'backup-status' commit 6e71922e6c918de9b60d2e9b1585835421738437 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 16:22:01 2011 -0600 Add a few new provides tests These deal with already-installed packages and how they should be the preferred provider in cases where provider selection now occurs. A few involve multiple sync repos. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a99e7272b8703e54b3c96ac0fdb7fe7eacfabbe8 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 16:11:33 2011 -0600 pactest: sort repos by alpha order in config file The order was non-deterministic before, and just happened to work for sync023.py as it was written. Ensure there is some sort of predictable ordering. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b3d71bf7d0ef8f577114bc39abecdc7ade0395dd Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 16:28:43 2011 -0600 pactest: use new-style python classes Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cda7d7847f3434959ef077ec6eb78ea4b2078a5a Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 22 11:38:34 2011 -0600 Be smarter about failure to read backup file contents Instead of always printing MISSING, we can switch on the errno value set by access() and print a more useful string. In this case, handle files we can't read by printing UNREADABLE, print MISSING on ENOENT, and print UNKNOWN for anything else. Fixes FS#22546. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c91bd3dda9540bb80f9e73fed87eee69b4675977 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 12 00:06:39 2011 -0600 Mark backup status strings as untranslated And also change "Not Modified" -> "UNMODIFIED" for consistency. This makes it a lot easier to machine-parse this and not worry about locale differences. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 61864e1f6f51549c3b32c0d82b8c9deacea3ed73 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 12 00:05:22 2011 -0600 Refactor backup file status check into separate function This will make it a lot easier to use this stuff elsewhere. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/package.c | 69 ++++++++++++++++++++++++------------- src/pacman/query.c | 48 +++++++++++++++++-------- src/pacman/util.c | 18 +++------- src/pacman/util.h | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 2 +- test/pacman/pmfile.py | 2 +- test/pacman/pmpkg.py | 2 +- test/pacman/pmrule.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/tests/provision002.py | 22 ++++++++++++ test/pacman/tests/provision003.py | 23 ++++++++++++ test/pacman/tests/provision004.py | 21 +++++++++++ test/pacman/tests/sync023.py | 3 +- test/pacman/util.py | 5 ++- 15 files changed, 162 insertions(+), 61 deletions(-) create mode 100644 test/pacman/tests/provision002.py create mode 100644 test/pacman/tests/provision003.py create mode 100644 test/pacman/tests/provision004.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 3/3] Be smarter about failure to read backup file contents
by dpmcgee＠gmail.com 22 Jan '11

22 Jan '11

From: Dan McGee <dan(a)archlinux.org> Instead of always printing MISSING, we can switch on the errno value set by access() and print a more useful string. In this case, handle files we can't read by printing UNREADABLE, print MISSING on ENOENT, and print UNKNOWN for anything else. Fixes FS#22546. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/package.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 68b0693..77a5ee7 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -25,6 +25,7 @@ #include <string.h> #include <unistd.h> #include <limits.h> +#include <errno.h> #include <wchar.h> #include <alpm.h> @@ -183,7 +184,16 @@ static const char *get_backup_file_status(const char *root, } free(md5sum); } else { - ret = "MISSING"; + switch(errno) { + case EACCES: + ret = "UNREADABLE"; + break; + case ENOENT: + ret = "MISSING"; + break; + default: + ret = "UNKNOWN"; + } } return(ret); } -- 1.7.3.5

1 0

[pacman-dev] [PATCH 2/3] Mark backup status strings as untranslated
by dpmcgee＠gmail.com 22 Jan '11

22 Jan '11

From: Dan McGee <dan(a)archlinux.org> And also change "Not Modified" -> "UNMODIFIED" for consistency. This makes it a lot easier to machine-parse this and not worry about locale differences. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/package.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 34eab22..68b0693 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -177,13 +177,13 @@ static const char *get_backup_file_status(const char *root, /* if checksums don't match, file has been modified */ if (strcmp(md5sum, expected_md5) != 0) { - ret = _("MODIFIED"); + ret = "MODIFIED"; } else { - ret = _("Not Modified"); + ret = "UNMODIFIED"; } free(md5sum); } else { - ret = _("MISSING"); + ret = "MISSING"; } return(ret); } -- 1.7.3.5

1 0

[pacman-dev] [PATCH 1/3] Refactor backup file status check into separate function
by dpmcgee＠gmail.com 22 Jan '11

22 Jan '11

From: Dan McGee <dan(a)archlinux.org> This will make it a lot easier to use this stuff elsewhere. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- In addition to the query fileowner speed improvements patches I just sent, this one is part of the logical path to implementing https://bugs.archlinux.org/task/19103. -Dan src/pacman/package.c | 59 +++++++++++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 7af3843..34eab22 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -157,6 +157,37 @@ void dump_pkg_sync(pmpkg_t *pkg, const char *treename, int level) dump_pkg_full(pkg, -level); } +static const char *get_backup_file_status(const char *root, + const char *filename, const char *expected_md5) +{ + char path[PATH_MAX]; + char *ret; + + snprintf(path, PATH_MAX, "%s%s", root, filename); + + /* if we find the file, calculate checksums, otherwise it is missing */ + if(access(path, R_OK) == 0) { + char *md5sum = alpm_compute_md5sum(path); + + if(md5sum == NULL) { + pm_fprintf(stderr, PM_LOG_ERROR, + _("could not calculate checksums for %s\n"), path); + return(NULL); + } + + /* if checksums don't match, file has been modified */ + if (strcmp(md5sum, expected_md5) != 0) { + ret = _("MODIFIED"); + } else { + ret = _("Not Modified"); + } + free(md5sum); + } else { + ret = _("MISSING"); + } + return(ret); +} + /* Display list of backup files and their modification states */ void dump_pkg_backups(pmpkg_t *pkg) @@ -167,37 +198,17 @@ void dump_pkg_backups(pmpkg_t *pkg) if(alpm_pkg_get_backup(pkg)) { /* package has backup files, so print them */ for(i = alpm_pkg_get_backup(pkg); i; i = alpm_list_next(i)) { - char path[PATH_MAX]; + const char *value; char *str = strdup(alpm_list_getdata(i)); - char *ptr = index(str, '\t'); + char *ptr = strchr(str, '\t'); if(ptr == NULL) { free(str); continue; } *ptr = '\0'; ptr++; - snprintf(path, PATH_MAX-1, "%s%s", root, str); - /* if we find the file, calculate checksums, otherwise it is missing */ - if(access(path, R_OK) == 0) { - char *md5sum = alpm_compute_md5sum(path); - - if(md5sum == NULL) { - pm_fprintf(stderr, PM_LOG_ERROR, - _("could not calculate checksums for %s\n"), path); - free(str); - continue; - } - - /* if checksums don't match, file has been modified */ - if (strcmp(md5sum, ptr) != 0) { - printf(_("MODIFIED\t%s\n"), path); - } else { - printf(_("Not Modified\t%s\n"), path); - } - free(md5sum); - } else { - printf(_("MISSING\t\t%s\n"), path); - } + value = get_backup_file_status(root, str, ptr); + printf("%s\t%s%s\n", value, root, str); free(str); } } else { -- 1.7.3.5

1 0

[pacman-dev] [PATCH 1/2] Improve mbasename performance
by Dan McGee 22 Jan '11

22 Jan '11

Rather than roll our own, use strrchr() instead, which glibc may have a better implementation than the simple iteration method we were using. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/query.c | 4 ++-- src/pacman/util.c | 18 +++++------------- src/pacman/util.h | 2 +- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index dea309a..f599360 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -109,8 +109,8 @@ static int query_fileowner(alpm_list_t *targets) for(t = targets; t; t = alpm_list_next(t)) { int found = 0; filename = strdup(alpm_list_getdata(t)); - char *bname, *dname, *rpath; - const char *root; + char *dname, *rpath; + const char *root, *bname; struct stat buf; alpm_list_t *i, *j; diff --git a/src/pacman/util.c b/src/pacman/util.c index d91d1d4..0377bf7 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -157,25 +157,17 @@ int rmrf(const char *path) } /** Parse the basename of a program from a path. -* Grabbed from the uClibc source. * @param path path to parse basename from * * @return everything following the final '/' */ -char *mbasename(const char *path) +const char *mbasename(const char *path) { - const char *s; - const char *p; - - p = s = path; - - while (*s) { - if (*s++ == '/') { - p = s; - } + const char *last = strrchr(path, '/'); + if(last) { + return(last + 1); } - - return (char *)p; + return(path); } /** Parse the dirname of a program from a path. diff --git a/src/pacman/util.h b/src/pacman/util.h index a5c382d..78fe5b5 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -44,7 +44,7 @@ int trans_release(void); int needs_root(void); int getcols(void); int rmrf(const char *path); -char *mbasename(const char *path); +const char *mbasename(const char *path); char *mdirname(const char *path); void indentprint(const char *str, int indent); char *strtoupper(char *str); -- 1.7.3.5

1 1