- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: allow url to be overridden in split packages
by Allan McRae 02 Jun '12

02 Jun '12

This is already being used (despite not working...) in packages in the Arch Linux repos. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 6 +++--- proto/PKGBUILD-split.proto | 1 + scripts/makepkg.sh.in | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 384af7c..404a55c 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -324,9 +324,9 @@ Each split package uses a corresponding packaging function with name All options and directives for the split packages default to the global values given in the PKGBUILD. Nevertheless, the following ones can be overridden within each split package's packaging function: -`pkgver`, `pkgrel`, `epoch`, `pkgdesc`, `arch`, `license`, `groups`, `depends`, -`optdepends`, `provides`, `conflicts`, `replaces`, `backup`, `options`, -`install` and `changelog`. +`pkgver`, `pkgrel`, `epoch`, `pkgdesc`, `arch`, `url`, `license`, `groups`, +`depends`, `optdepends`, `provides`, `conflicts`, `replaces`, `backup`, +`options`, `install` and `changelog`. An optional global directive is available when building a split package: diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index 763cb86..f873db6 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -46,6 +46,7 @@ package_pkg1() { epoch= pkgdesc="" arch=() + url="" license=() groups=() depends=() diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b0918ae..bd7a44f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -46,7 +46,7 @@ declare -r startdir="$PWD" packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') -splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'license' \ +splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ 'groups' 'depends' 'optdepends' 'provides' 'conflicts' \ 'replaces' 'backup' 'options' 'install' 'changelog') readonly -a packaging_options other_options splitpkg_overrides -- 1.7.10.3

1 0

[pacman-dev] [RFC] [PATCH] makepkg: run locally with libtool style wrapper
by Allan McRae 28 May '12

28 May '12

Build makepkg to scripts/.lib/makepkg and add a wrapper script to call it. This is not useful at the moment, but is the first step to allowing makepkg to be split into smaller pieces. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This seems somewhat horrid, but I could not find a better way to do this. Once this splitting is started, it will be easy(er) to overhaul the VCS PKGBUILD system, and perhaps debugging symbol packages too... Tested that building and running "makepkg" in the usual way works, "make install" and "make distcheck" work. scripts/.gitignore | 1 + scripts/Makefile.am | 27 ++++++++++++++++++++++++++- scripts/makepkg-wrapper.sh.in | 23 +++++++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 scripts/makepkg-wrapper.sh.in diff --git a/scripts/.gitignore b/scripts/.gitignore index 9e403bf..0310b9b 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -1,4 +1,5 @@ makepkg +makepkg-wrapper pacman-db-upgrade pacman-key pacman-optimize diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 9a08524..71d6cc4 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = std-options SUBDIRS = po bin_SCRIPTS = \ - $(OURSCRIPTS) + $(OURSCRIPTS) \ + makepkg-wrapper OURSCRIPTS = \ makepkg \ @@ -16,6 +17,7 @@ OURSCRIPTS = \ EXTRA_DIST = \ makepkg.sh.in \ + makepkg-wrapper.sh.in \ pacman-db-upgrade.sh.in \ pacman-key.sh.in \ pacman-optimize.sh.in \ @@ -32,6 +34,9 @@ LIBRARY = \ # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(bin_SCRIPTS) +clean-local: + $(AM_V_at)rm -rf .lib + if USE_GIT_VERSION GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//') REAL_PACKAGE_VERSION = $(GIT_VERSION) @@ -69,6 +74,7 @@ $(OURSCRIPTS): Makefile makepkg: \ $(srcdir)/makepkg.sh.in \ + $(srcdir)/makepkg-wrapper.sh.in \ $(srcdir)/library/parseopts.sh pacman-db-upgrade: \ @@ -101,8 +107,27 @@ repo-elephant: $(srcdir)/repo-add.sh.in $(RM) repo-elephant $(LN_S) repo-add repo-elephant +makepkg-wrapper: \ + Makefile \ + $(srcdir)/makepkg-wrapper.sh.in \ + $(srcdir)/makepkg.sh.in \ + $(srcdir)/library/parseopts.sh \ + | makepkg + $(AM_V_at)$(MKDIR_P) .lib + $(AM_V_at)mv -f makepkg .lib + $(AM_V_at)$(RM) $@ + $(AM_V_GEN)sed \ + -e "s|@PWD[@]|$$(pwd)|" \ + -e '1s|!/bin/bash|!$(BASH_SHELL)|g' \ + $(srcdir)/$@.sh.in > $@ + $(AM_V_at)chmod +x,a-w $@ + $(AM_V_at)$(LN_S) makepkg-wrapper makepkg + install-data-hook: cd $(DESTDIR)$(bindir) && \ + $(RM) makepkg makepkg-wrapper + $(INSTALL) .lib/makepkg $(DESTDIR)$(bindir)/makepkg + cd $(DESTDIR)$(bindir) && \ $(RM) repo-elephant && \ ( $(LN_S) repo-add repo-elephant || \ ln repo-add repo-elephant || \ diff --git a/scripts/makepkg-wrapper.sh.in b/scripts/makepkg-wrapper.sh.in new file mode 100644 index 0000000..70cda93 --- /dev/null +++ b/scripts/makepkg-wrapper.sh.in @@ -0,0 +1,23 @@ +#!/bin/bash +# +# makepkg - a wrapper for running the real makepkg in the source tree +# +# Copyright (c) 2012 Pacman Development Team <pacman-dev(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/>. +# + +DIR=@PWD@ + +LIBRARY=$DIR/libmakepkg $DIR/.lib/makepkg "$@" -- 1.7.10.2

1 0

[pacman-dev] [PATCH] Allow querying directory ownership
by andrew.gregory.8＠gmail.com 25 May '12

25 May '12

From: Andrew Gregory <andrew.gregory.8(a)gmail.com> The restriction of not checking the ownership of a directory is unnecessary given that all the package filelists contain this information. Additional Changes: * mbasename/mdirname behave more like their posix counterparts * check that files are in root before looking for an owner * only compare package files of the same type as the target file * add lrealpath, like realpath but for symlinks * resolve root and make sure it ends with '/' * removed resolve_path() Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- This is an alternative to Allan's recent patch. This pretty thoroughly rewrites query_fileowner() and attempts to simplify the process in addition to allowing querying directories. I mentioned before that my version assumed that package file paths didn't contain symlinks; that assumption has been removed. My public repo is available at: https://bitbucket.org/andrewgregory/pacman/changesets/tip/dir_own_final It includes a perl script in src/pacan used to test this patch against various file/directory/symlink situations. src/pacman/query.c | 185 ++++++++++++++++++++++++++++------------------------ src/pacman/util.c | 128 ++++++++++++++++++++++++++++-------- src/pacman/util.h | 4 +- 3 files changed, 205 insertions(+), 112 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index a1cc1cf..6ef0744 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -36,23 +36,6 @@ #include "conf.h" #include "util.h" -static char *resolve_path(const char *file) -{ - char *str = NULL; - - str = calloc(PATH_MAX, sizeof(char)); - if(!str) { - return NULL; - } - - if(!realpath(file, str)) { - free(str); - return NULL; - } - - return str; -} - /* check if filename exists in PATH */ static int search_path(char **filename, struct stat *bufptr) { @@ -107,134 +90,166 @@ static void print_query_fileowner(const char *filename, alpm_pkg_t *info) static int query_fileowner(alpm_list_t *targets) { - int ret = 0; - char path[PATH_MAX]; - const char *root; - size_t rootlen; - alpm_list_t *t; - alpm_db_t *db_local; - - /* This code is here for safety only */ if(targets == NULL) { pm_printf(ALPM_LOG_ERROR, _("no file was specified for --owns\n")); return 1; } - /* Set up our root path buffer. We only need to copy the location of root in - * once, then we can just overwrite whatever file was there on the previous - * iteration. */ - root = alpm_option_get_root(config->handle); + struct stat buf; + char root[PATH_MAX]; + size_t rootlen; + char path[PATH_MAX]; /* absolute real path of the target */ + char ppath[PATH_MAX]; /* absolute real path of the package file */ + int ret = 0; + + /* make sure root is a real path */ + if(realpath(alpm_option_get_root(config->handle), root) == NULL) { + pm_printf(ALPM_LOG_ERROR, + _("cannot determine real path for '%s': %s\n"), + alpm_option_get_root(config->handle), strerror(errno)); + return 1; + }; rootlen = strlen(root); - if(rootlen + 1 > PATH_MAX) { - /* we are in trouble here */ + /* make sure root ends with '/' */ + if(root[rootlen - 1] != '/' && rootlen < PATH_MAX) { + root[rootlen] = '/'; + rootlen++; + root[rootlen] = '\0'; + } + /* make sure we actually have room to append the package files */ + if(rootlen >= PATH_MAX) { pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, ""); return 1; } - strcpy(path, root); - db_local = alpm_get_localdb(config->handle); + alpm_db_t *db_local = alpm_get_localdb(config->handle); + alpm_list_t *packages = alpm_db_get_pkgcache(db_local); + /* loop through targets */ + alpm_list_t *t; for(t = targets; t; t = alpm_list_next(t)) { - char *filename, *dname, *rpath; - const char *bname; - struct stat buf; - alpm_list_t *i; + char *filename = strdup(t->data); + char *bname; int found = 0; + int is_dir = 0; - filename = strdup(t->data); - + /* read target */ if(lstat(filename, &buf) == -1) { - /* if it is not a path but a program name, then check in PATH */ if(strchr(filename, '/') == NULL) { + /* if it is not a path but a program name, then check in PATH */ if(search_path(&filename, &buf) == -1) { - pm_printf(ALPM_LOG_ERROR, _("failed to find '%s' in PATH: %s\n"), + pm_printf(ALPM_LOG_ERROR, + _("failed to find '%s' in PATH: %s\n"), filename, strerror(errno)); ret++; free(filename); continue; } } else { + /* filename is a path we can't read so bail */ + pm_printf(ALPM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + free(filename); + continue; + } + } + if((is_dir = S_ISDIR(buf.st_mode))){ + /* make sure filename doesn't end with '/' because + * lstat('/var/mail') is not the same as lstat("/var/mail/") */ + size_t flast = strlen(filename) - 1; + while(filename[flast] == '/' && flast > 0) { + filename[flast] = '\0'; + flast--; + } + if(lstat(filename, &buf) == -1) { pm_printf(ALPM_LOG_ERROR, _("failed to read file '%s': %s\n"), filename, strerror(errno)); ret++; free(filename); continue; } + /* check if filename is actually a symlink */ + is_dir = S_ISDIR(buf.st_mode); } - if(S_ISDIR(buf.st_mode)) { + /* convert filename to its real path */ + if(lrealpath(filename, path) == NULL) { pm_printf(ALPM_LOG_ERROR, - _("cannot determine ownership of directory '%s'\n"), filename); + _("cannot determine real path for '%s': %s\n"), + filename, strerror(errno)); ret++; free(filename); continue; } - bname = mbasename(filename); - dname = mdirname(filename); - /* for files in '/', there is no directory name to match */ - if(strcmp(dname, "") == 0) { - rpath = NULL; - } else { - rpath = resolve_path(dname); - - if(!rpath) { - pm_printf(ALPM_LOG_ERROR, _("cannot determine real path for '%s': %s\n"), - filename, strerror(errno)); - free(filename); - free(dname); - free(rpath); - ret++; - continue; - } + /* make sure target is inside root */ + if( strlen(path) <= rootlen || strncmp(path, root, rootlen) != 0) { + pm_printf(ALPM_LOG_ERROR, + _("cannot determine ownership of file outside of root\n")); + ret++; + free(filename); + continue; } - free(dname); - for(i = alpm_db_get_pkgcache(db_local); i && !found; i = alpm_list_next(i)) { + bname = mbasename(path); + + /* loop through installed packages */ + alpm_list_t *i; + for(i = packages; i && (!found || is_dir); i = alpm_list_next(i)) { alpm_pkg_t *info = i->data; alpm_filelist_t *filelist = alpm_pkg_get_files(info); - size_t j; - for(j = 0; j < filelist->count; j++) { + /* loop through package files */ + size_t j; + for(j = 0; j < filelist->count && (!found || is_dir); j++) { const alpm_file_t *file = filelist->files + j; - char *ppath, *pdname; - const char *pkgfile = file->name; + size_t flen = strlen(file->name); - /* avoid the costly resolve_path usage if the basenames don't match */ - if(strcmp(mbasename(pkgfile), bname) != 0) { + if(rootlen + flen >= PATH_MAX) { + pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), + root, file->name); + ret++; continue; - } + }; - /* for files in '/', there is no directory name to match */ - if(!rpath) { - print_query_fileowner(filename, info); - found = 1; + /* continue if target and file are not the same type */ + if(!is_dir == (file->name[flen - 1] == '/')) { continue; } - if(rootlen + 1 + strlen(pkgfile) > PATH_MAX) { - pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, pkgfile); + /* check basenames before we bother resolving the path */ + char *pbname = mbasename(file->name); + if(pbname && strcmp(pbname, bname) != 0) { + free(pbname); + continue; } - /* concatenate our file and the root path */ - strcpy(path + rootlen, pkgfile); + free(pbname); - pdname = mdirname(path); - ppath = resolve_path(pdname); - free(pdname); + /* resolve and compare the path */ + strcpy(root + rootlen, file->name); + if(lrealpath(root, ppath) == NULL) { + pm_printf(ALPM_LOG_ERROR, + _("cannot determine real path for '%s': %s\n"), + file->name, strerror(errno)); + ret++; + continue; + }; - if(ppath && strcmp(ppath, rpath) == 0) { - print_query_fileowner(filename, info); + if(strcmp(ppath, path) == 0) { + print_query_fileowner(path, info); found = 1; } - free(ppath); } } + if(!found) { - pm_printf(ALPM_LOG_ERROR, _("No package owns %s\n"), filename); + pm_printf(ALPM_LOG_ERROR, _("No package owns %s\n"), path); ret++; } + + free(bname); free(filename); - free(rpath); } return ret; diff --git a/src/pacman/util.c b/src/pacman/util.c index 7f7f6a7..733da9f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -211,45 +211,121 @@ int rmrf(const char *path) } /** Parse the basename of a program from a path. +* Equivalent to posix basename except \a path is never modified and the +* returned string needs to be freed. +* * @param path path to parse basename from * -* @return everything following the final '/' +* @return final component of \a path */ -const char *mbasename(const char *path) +char *mbasename(const char *path) { - const char *last = strrchr(path, '/'); - if(last) { - return last + 1; - } - return path; + char *tmp = strdup(path); + char *bname = strdup(basename(tmp)); + free(tmp); + return bname; } /** Parse the dirname of a program from a path. -* The path returned should be freed. +* Equivalent to posix dirname except \a path is never modified and the +* returned string needs to be freed. +* * @param path path to parse dirname from * -* @return everything preceding the final '/' +* @return everything preceding the final component of \a path */ char *mdirname(const char *path) { - char *ret, *last; + char *tmp = strdup(path); + char *dname = strdup(dirname(tmp)); + free(tmp); + return dname; +} - /* null or empty path */ - if(path == NULL || path == '\0') { - return strdup("."); +/** Resolve a path to its canonicalized absolute pathname. +* Equivalent to posix realpath except that if \a path points to a symlink the +* parent directory is resolved rather than the symlink itself. +* +* @param path path to resolve +* @param resolved_path string to hold resolved path, will be malloc'd if NULL +* +* @return pointer to resolved_path on success, NULL on error +*/ +char *lrealpath(const char *path, char *resolved_path) +{ + char *bname = NULL; + char *dname = NULL; + int need_free = 0; /* did we calloc resolved_path? */ + + bname = mbasename(path); + if(bname == NULL) { + goto error; + } else if(strcmp(bname, "..") == 0 + || strcmp(bname, ".") == 0 + || strcmp(bname, "/") == 0) { + /* handle a few special cases of bname */ + dname = strdup(path); + bname = NULL; + free(bname); + } else { + dname = mdirname(path); + } + if(dname == NULL) { + goto error; } - ret = strdup(path); - last = strrchr(ret, '/'); + if(resolved_path == NULL) { + resolved_path = calloc(PATH_MAX, sizeof(char)); + if(resolved_path == NULL) { + goto error; + } + need_free = 1; + } - if(last != NULL) { - /* we found a '/', so terminate our string */ - *last = '\0'; - return ret; + if(realpath(dname, resolved_path) == NULL) { + goto error; } - /* no slash found */ - free(ret); - return strdup("."); + + /* add bname back if we have a valid one */ + if(bname) { + size_t rlen = strlen(resolved_path); + + /* error out if resolved_path is too long to append bname */ + if((rlen + strlen(bname) + 2) >= PATH_MAX) { + goto error; + } + + /* append trailing '/' if needed */ + if(resolved_path[rlen - 1] != '/') { + resolved_path[rlen] = '/'; + resolved_path[rlen+1] = '\0'; + rlen++; + } + + strcpy(resolved_path + rlen, bname); + } + + if(bname) { + free(bname); + } + if(dname) { + free(dname); + } + + return resolved_path; + +error: + if(need_free) { + free(resolved_path); + } + if(bname) { + free(bname); + } + if(dname) { + free(dname); + } + + return NULL; } /* output a string, but wrap words properly with a specified indentation @@ -1661,9 +1737,9 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list /* A quick and dirty implementation derived from glibc */ static size_t strnlen(const char *s, size_t max) { - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); + register const char *p; + for(p = s; *p && max--; ++p); + return (p - s); } char *strndup(const char *s, size_t n) @@ -1672,7 +1748,7 @@ char *strndup(const char *s, size_t n) char *new = (char *) malloc(len + 1); if(new == NULL) - return NULL; + return NULL; new[len] = '\0'; return (char *)memcpy(new, s, len); diff --git a/src/pacman/util.h b/src/pacman/util.h index 0dfdc85..b51505a 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -23,6 +23,7 @@ #include <stdlib.h> #include <stdarg.h> #include <string.h> +#include <libgen.h> #include <alpm_list.h> @@ -49,8 +50,9 @@ int needs_root(void); int check_syncdbs(size_t need_repos, int check_valid); unsigned short getcols(int fd); int rmrf(const char *path); -const char *mbasename(const char *path); +char *mbasename(const char *path); char *mdirname(const char *path); +char *lrealpath(const char *path, char *resolved_path); void indentprint(const char *str, unsigned short indent, unsigned short cols); size_t strtrim(char *str); char *strreplace(const char *str, const char *needle, const char *replace); -- 1.7.10.2

1 0

[pacman-dev] [PATCH][RFC] packages ignored based on provides w/ needed flag
by Daniel Wallace 23 May '12

23 May '12

for FS#29935 https://bugs.archlinux.org/task/29935 This patch will cause packages like notification-daemon to be ignored if something providing notification-daemon is installed, mostly useful for when installing groups like pacman -Syu gnome. It also causes packages to be ignored based on if the things it provides are already installed, tested on jre7 from aur and then trying to install jre7-openjdk with the --needed flag. This also works with sysv and initscripts, if you have removed them in favor of sysvcompat, pacman -Syu base --needed should ignore those packages Signed-off-by: Daniel Wallace <daniel.wallace(a)gatech.edu> --- lib/libalpm/add.c | 11 ++++++++++- lib/libalpm/package.c | 23 +++++++++++++++++++++++ lib/libalpm/package.h | 2 ++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index edddc31..6ebd9cf 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -93,7 +93,16 @@ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) localpkgname, localpkgver, pkgver); } } - + /* find if the package is provided by something else and */ + int provided = _alpm_pkg_is_provided(handle, pkg); + int provisionprovided=_alpm_pkg_provision_provided(handle,pkg->provides); + if(provided==0||provisionprovided==0){ + if(trans->flags & ALPM_TRANS_FLAG_NEEDED){ + _alpm_log(handle, ALPM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"), + pkgname, pkgver); + return 0; + } + } /* add the package to the transaction */ pkg->reason = ALPM_PKG_REASON_EXPLICIT; _alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s-%s to the transaction add list\n", diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 46d1473..d346c70 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -646,6 +646,29 @@ int _alpm_pkg_compare_versions(alpm_pkg_t *spkg, alpm_pkg_t *localpkg) return alpm_pkg_vercmp(spkg->version, localpkg->version); } +int _alpm_pkg_is_provided(alpm_handle_t *handle,alpm_pkg_t *pkg) +{ + alpm_db_t *localdb = alpm_get_localdb(handle); + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), pkg->name)) { + return 0; + } + return 1; +} +int _alpm_pkg_provision_provided(alpm_handle_t *handle,alpm_list_t *provs) +{ + if(provs==NULL){ + return 1; + } + const alpm_list_t *i; + alpm_db_t *localdb = alpm_get_localdb(handle); + for (i=provs;i;i=i->next){ + if(!(alpm_find_satisfier(alpm_db_get_pkgcache(localdb),(char *)i->data))) { + return 1; + } + } + return 0; +} + /* Helper function for comparing packages */ int _alpm_pkg_cmp(const void *p1, const void *p2) diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index c473549..b3c56f3 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -141,6 +141,8 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, int _alpm_pkg_cmp(const void *p1, const void *p2); int _alpm_pkg_compare_versions(alpm_pkg_t *local_pkg, alpm_pkg_t *pkg); +int _alpm_pkg_is_provided(alpm_handle_t *handle,alpm_pkg_t *pkg); +int _alpm_pkg_provision_provided(alpm_handle_t *handle,alpm_list_t *provs); alpm_pkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle); int _alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg); -- 1.7.10.2

2 1

[pacman-dev] Purging symlinks
by Jeremy Huntwork 23 May '12

23 May '12

Hi, In current makepkg, file name patterns specified in PURGE_TARGETS will only match files (and not symlinks) due to: find . -type f -name "${pt}" -exec rm -f -- '{}' \; Is this intentional? Thanks, JH

2 4

[pacman-dev] [PATCH] Portability fixes for makepkg
by jhuntwork＠lightcubesolutions.com 23 May '12

23 May '12

From: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> Allow makepkg to work correctly when used with find from busybox. Fix handling of cross directory symlinks. Signed-off-by: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> --- configure.ac | 5 ++++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 51 +++++++++++++++++++++--------------------------- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/configure.ac b/configure.ac index 15e93e7..5483ee1 100644 --- a/configure.ac +++ b/configure.ac @@ -287,6 +287,7 @@ GCC_VISIBILITY_CC GCC_GNU89_INLINE_CC # Host-dependant definitions +INODECMD="stat -c '%i %n'" SIZECMD="stat -c %s" SEDINPLACE="sed -i" STRIP_BINARIES="--strip-all" @@ -294,6 +295,7 @@ STRIP_SHARED="--strip-unneeded" STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) + INODECMD="stat -f '%i %n'" SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" ;; @@ -303,6 +305,7 @@ case "${host_os}" in ;; darwin*) host_os_darwin=yes + INODECMD="/usr/bin/stat -f '%i %n'" SIZECMD="/usr/bin/stat -f %z" SEDINPLACE="/usr/bin/sed -i ''" STRIP_BINARIES="" @@ -314,6 +317,7 @@ esac AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) +AC_SUBST(INODECMD) AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) AC_SUBST(STRIP_BINARIES) @@ -487,6 +491,7 @@ ${PACKAGE_NAME}: Architecture : ${CARCH} Host Type : ${CHOST} + File inode command : ${INODECMD} Filesize command : ${SIZECMD} In-place sed command : ${SEDINPLACE} diff --git a/scripts/Makefile.am b/scripts/Makefile.am index ae36624..4747074 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -49,6 +49,7 @@ edit = sed \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ + -e "s|@INODECMD[@]|$(INODECMD)|g" \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ -e 's|@DUPATH[@]|$(DUPATH)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 718b4e9..b0918ae 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1057,37 +1057,30 @@ tidy_install() { if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then msg2 "$(gettext "Compressing man and info pages...")" - local manpage ext file link hardlinks hl - find ${MAN_DIRS[@]} -type f 2>/dev/null | - while read manpage ; do - ext="${manpage##*.}" - file="${manpage##*/}" - if [[ $ext != gz && $ext != bz2 ]]; then - # update symlinks to this manpage - find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | - while read link ; do + local file files inode link + while read -rd ' ' inode; do + read file + find ${MAN_DIRS[@]} -type l 2>/dev/null | + while read link ; do + if [[ "${file}" -ef "${link}" ]] ; then rm -f "$link" "${link}.gz" - ln -s -- "${file}.gz" "${link}.gz" - done - - # check file still exists (potentially already compressed due to hardlink) - if [[ -f ${manpage} ]]; then - # find hard links and remove them - # the '|| true' part keeps the script from bailing on the EOF returned - # by read at the end of the find output - mapfile -t hardlinks < \ - <(find ${MAN_DIRS[@]} ! -name "$file" -samefile "$manpage" 2>/dev/null) - rm -f "${hardlinks[@]}" - # compress the original - gzip -9 "$manpage" - # recreate hard links removed earlier - for hl in "${hardlinks[@]}"; do - ln "${manpage}.gz" "${hl}.gz" - chmod 644 ${hl}.gz - done + if [[ ${file%/*} = ${link%/*} ]]; then + ln -s -- "${file##*/}.gz" "${link}.gz" + else + ln -s -- "/${file}.gz" "${link}.gz" + fi fi + done + if [[ -z ${files[$inode]} ]]; then + files[$inode]=$file + gzip -9 -f "$file" + else + rm -f "$file" + ln "${files[$inode]}.gz" "${file}.gz" + chmod 644 "${file}.gz" fi - done + done < <(find ${MAN_DIRS[@]} -type f \! -name "*.gz" \! -name "*.bz2" \ + -exec @INODECMD@ '{}' + 2>/dev/null) fi if check_option "strip" "y"; then @@ -1115,7 +1108,7 @@ tidy_install() { if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" - find . -depth -type d -empty -delete + find . -depth -type d -exec rmdir '{}' + 2>/dev/null fi if check_option "upx" "y"; then -- 1.7.1

1 0

[pacman-dev] [PATCH] Portability fixes for makepkg
by jhuntwork＠lightcubesolutions.com 23 May '12

23 May '12

From: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> Allow makepkg to work correctly when used with find from busybox. Update to last submitted patch to use basename value of file path for symlinks. Signed-off-by: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> --- configure.ac | 5 +++++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 47 ++++++++++++++++++----------------------------- 3 files changed, 24 insertions(+), 29 deletions(-) diff --git a/configure.ac b/configure.ac index 15e93e7..5483ee1 100644 --- a/configure.ac +++ b/configure.ac @@ -287,6 +287,7 @@ GCC_VISIBILITY_CC GCC_GNU89_INLINE_CC # Host-dependant definitions +INODECMD="stat -c '%i %n'" SIZECMD="stat -c %s" SEDINPLACE="sed -i" STRIP_BINARIES="--strip-all" @@ -294,6 +295,7 @@ STRIP_SHARED="--strip-unneeded" STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) + INODECMD="stat -f '%i %n'" SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" ;; @@ -303,6 +305,7 @@ case "${host_os}" in ;; darwin*) host_os_darwin=yes + INODECMD="/usr/bin/stat -f '%i %n'" SIZECMD="/usr/bin/stat -f %z" SEDINPLACE="/usr/bin/sed -i ''" STRIP_BINARIES="" @@ -314,6 +317,7 @@ esac AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) +AC_SUBST(INODECMD) AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) AC_SUBST(STRIP_BINARIES) @@ -487,6 +491,7 @@ ${PACKAGE_NAME}: Architecture : ${CARCH} Host Type : ${CHOST} + File inode command : ${INODECMD} Filesize command : ${SIZECMD} In-place sed command : ${SEDINPLACE} diff --git a/scripts/Makefile.am b/scripts/Makefile.am index ae36624..4747074 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -49,6 +49,7 @@ edit = sed \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ + -e "s|@INODECMD[@]|$(INODECMD)|g" \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ -e 's|@DUPATH[@]|$(DUPATH)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 718b4e9..a73fcf3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1057,37 +1057,26 @@ tidy_install() { if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then msg2 "$(gettext "Compressing man and info pages...")" - local manpage ext file link hardlinks hl - find ${MAN_DIRS[@]} -type f 2>/dev/null | - while read manpage ; do - ext="${manpage##*.}" - file="${manpage##*/}" - if [[ $ext != gz && $ext != bz2 ]]; then - # update symlinks to this manpage - find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | - while read link ; do + local file files inode link + while read -rd ' ' inode; do + read file + find ${MAN_DIRS[@]} -type l 2>/dev/null | + while read link ; do + if [[ "${file}" -ef "${link}" ]] ; then rm -f "$link" "${link}.gz" - ln -s -- "${file}.gz" "${link}.gz" - done - - # check file still exists (potentially already compressed due to hardlink) - if [[ -f ${manpage} ]]; then - # find hard links and remove them - # the '|| true' part keeps the script from bailing on the EOF returned - # by read at the end of the find output - mapfile -t hardlinks < \ - <(find ${MAN_DIRS[@]} ! -name "$file" -samefile "$manpage" 2>/dev/null) - rm -f "${hardlinks[@]}" - # compress the original - gzip -9 "$manpage" - # recreate hard links removed earlier - for hl in "${hardlinks[@]}"; do - ln "${manpage}.gz" "${hl}.gz" - chmod 644 ${hl}.gz - done + ln -s -- "${file##*/}.gz" "${link}.gz" fi + done + if [[ -z ${files[$inode]} ]]; then + files[$inode]=$file + gzip -9 -f "$file" + else + rm -f "$file" + ln "${files[$inode]}.gz" "${file}.gz" + chmod 644 "${file}.gz" fi - done + done < <(find ${MAN_DIRS[@]} -type f \! -name "*.gz" \! -name "*.bz2" \ + -exec @INODECMD@ '{}' + 2>/dev/null) fi if check_option "strip" "y"; then @@ -1115,7 +1104,7 @@ tidy_install() { if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" - find . -depth -type d -empty -delete + find . -mindepth 1 -depth -type d -exec rmdir '{}' + 2>/dev/null fi if check_option "upx" "y"; then -- 1.7.1

3 4

[pacman-dev] [PATCH v3] Allow querying directory ownership
by Allan McRae 22 May '12

22 May '12

The restriction of not checking the ownership of a directory is unnecessary given that all the package filelists contain this information. Remove this restriction, with the expectation that you might get multiple packages returned for a given directory. Additionally attempt to minimise the number of files getting through to the slow realpath call. This combines ideas from two patches that have been around for a long time. Original-work-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Original-work-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v3 - Now with less segfaults on the rather silly "pacman -Qo /"... src/pacman/query.c | 70 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 15 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 07509fa..67dd11c 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -113,6 +113,7 @@ static int query_fileowner(alpm_list_t *targets) size_t rootlen; alpm_list_t *t; alpm_db_t *db_local; + alpm_list_t *packages; /* This code is here for safety only */ if(targets == NULL) { @@ -133,13 +134,14 @@ static int query_fileowner(alpm_list_t *targets) strcpy(path, root); db_local = alpm_get_localdb(config->handle); + packages = alpm_db_get_pkgcache(db_local); for(t = targets; t; t = alpm_list_next(t)) { char *filename, *dname, *rpath; - const char *bname; + const char *bname, *rpath_bname = NULL; struct stat buf; alpm_list_t *i; - int found = 0; + size_t found = 0, isdir, bname_len, rpath_len = 0, rpath_bname_len = 0; filename = strdup(t->data); @@ -162,16 +164,19 @@ static int query_fileowner(alpm_list_t *targets) } } - if(S_ISDIR(buf.st_mode)) { - pm_printf(ALPM_LOG_ERROR, - _("cannot determine ownership of directory '%s'\n"), filename); - ret++; - free(filename); - continue; + /* make sure directories have a trailing '/' */ + if((isdir = S_ISDIR(buf.st_mode))) { + size_t len = strlen(filename); + if(filename[len-1] != '/') { + filename = realloc(filename, sizeof(char) * (len + 2)); + strcat(filename, "/"); + } } bname = mbasename(filename); + bname_len = strlen(bname); dname = mdirname(filename); + /* for files in '/', there is no directory name to match */ if(strcmp(dname, "") == 0) { rpath = NULL; @@ -181,16 +186,26 @@ static int query_fileowner(alpm_list_t *targets) if(!rpath) { pm_printf(ALPM_LOG_ERROR, _("cannot determine real path for '%s': %s\n"), filename, strerror(errno)); - free(filename); free(dname); - free(rpath); ret++; - continue; + goto cleanup; } } free(dname); - for(i = alpm_db_get_pkgcache(db_local); i && !found; i = alpm_list_next(i)) { + if(isdir) { + if(!rpath) { + pm_printf(ALPM_LOG_ERROR, _("cannot determine ownership of root directory\n")); + ret++; + goto cleanup; + } else { + rpath_len = strlen(rpath); + rpath_bname = mbasename(rpath); + rpath_bname_len = strlen(rpath_bname); + } + } + + for(i = packages; i && (!found || isdir); i = alpm_list_next(i)) { alpm_pkg_t *info = i->data; alpm_filelist_t *filelist = alpm_pkg_get_files(info); size_t j; @@ -199,17 +214,40 @@ static int query_fileowner(alpm_list_t *targets) const alpm_file_t *file = filelist->files + j; char *ppath, *pdname; const char *pkgfile = file->name; + size_t pkgfile_len = strlen(pkgfile); - /* avoid the costly resolve_path usage if the basenames don't match */ - if(strcmp(mbasename(pkgfile), bname) != 0) { + /* avoid the costly resolve_path usage if the basenames don't match; + * we can also cheat by comparing the final characters first and avoid + * a full string comparison */ + if(!isdir && (pkgfile[pkgfile_len - 1] != bname[bname_len - 1] || + strcmp(mbasename(pkgfile), bname) != 0)) { continue; } + if(isdir) { + /* check the filelist entry is a directory using its + * trailing '/' and compare final characters of directory + * names. */ + if(pkgfile[pkgfile_len - 1] != '/' || + pkgfile[pkgfile_len - 2] != rpath[rpath_len - 1]) { + continue; + } + + /* compare final directory portion */ + if(pkgfile_len - 1 < rpath_bname_len || + (pkgfile_len - 2 >= rpath_bname_len && + pkgfile[pkgfile_len - 2 - rpath_bname_len] != '/') || + strncmp(pkgfile + pkgfile_len - 1 - rpath_bname_len, + rpath_bname, rpath_bname_len)) { + continue; + } + } + /* for files in '/', there is no directory name to match */ if(!rpath) { print_query_fileowner(filename, info); found = 1; - continue; + break; } if(rootlen + 1 + strlen(pkgfile) > PATH_MAX) { @@ -233,6 +271,8 @@ static int query_fileowner(alpm_list_t *targets) pm_printf(ALPM_LOG_ERROR, _("No package owns %s\n"), filename); ret++; } + +cleanup: free(filename); free(rpath); } -- 1.7.10.2

2 1

[pacman-dev] [PATCH] Allow querying directory ownership
by Allan McRae 22 May '12

22 May '12

The restriction of not checking the ownership of a directory is unnecessary given that all the package filelists contain this information. Remove this restriction, with the expectation that you might get multiple packages returned for a given directory. Additionally attempt to minimise the number of files getting through to the slow realpath call. This combines ideas from two patches that have been around for a long time. Original-work-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Original-work-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/query.c | 58 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 07509fa..cf14fab 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -113,6 +113,7 @@ static int query_fileowner(alpm_list_t *targets) size_t rootlen; alpm_list_t *t; alpm_db_t *db_local; + alpm_list_t *packages; /* This code is here for safety only */ if(targets == NULL) { @@ -133,13 +134,14 @@ static int query_fileowner(alpm_list_t *targets) strcpy(path, root); db_local = alpm_get_localdb(config->handle); + packages = alpm_db_get_pkgcache(db_local); for(t = targets; t; t = alpm_list_next(t)) { char *filename, *dname, *rpath; - const char *bname; + const char *bname, *rpath_bname = NULL; struct stat buf; alpm_list_t *i; - int found = 0; + size_t found = 0, isdir, bname_len, rpath_len, rpath_bname_len = 0; filename = strdup(t->data); @@ -162,16 +164,19 @@ static int query_fileowner(alpm_list_t *targets) } } - if(S_ISDIR(buf.st_mode)) { - pm_printf(ALPM_LOG_ERROR, - _("cannot determine ownership of directory '%s'\n"), filename); - ret++; - free(filename); - continue; + /* make sure directories have a trailing '/' */ + if((isdir = S_ISDIR(buf.st_mode))) { + size_t len = strlen(filename); + if(filename[len-1] != '/') { + filename = realloc(filename, sizeof(char) * (len + 2)); + strcat(filename, "/"); + } } bname = mbasename(filename); + bname_len = strlen(bname); dname = mdirname(filename); + /* for files in '/', there is no directory name to match */ if(strcmp(dname, "") == 0) { rpath = NULL; @@ -189,8 +194,14 @@ static int query_fileowner(alpm_list_t *targets) } } free(dname); + rpath_len = strlen(rpath); - for(i = alpm_db_get_pkgcache(db_local); i && !found; i = alpm_list_next(i)) { + if(isdir) { + rpath_bname = mbasename(rpath); + rpath_bname_len = strlen(rpath_bname); + } + + for(i = packages; i && (!found || isdir); i = alpm_list_next(i)) { alpm_pkg_t *info = i->data; alpm_filelist_t *filelist = alpm_pkg_get_files(info); size_t j; @@ -199,17 +210,40 @@ static int query_fileowner(alpm_list_t *targets) const alpm_file_t *file = filelist->files + j; char *ppath, *pdname; const char *pkgfile = file->name; + size_t pkgfile_len = strlen(pkgfile); - /* avoid the costly resolve_path usage if the basenames don't match */ - if(strcmp(mbasename(pkgfile), bname) != 0) { + /* avoid the costly resolve_path usage if the basenames don't match; + * we can also cheat by comparing the final characters first and avoid + * a full string comparison */ + if(!isdir && (pkgfile[pkgfile_len - 1] != bname[bname_len - 1] || + strcmp(mbasename(pkgfile), bname) != 0)) { continue; } + if(isdir) { + /* check the filelist entry is a directory using its + * trailing '/' and compare final characters of directory + * names. */ + if(pkgfile[pkgfile_len - 1] != '/' || + pkgfile[pkgfile_len - 2] != rpath[rpath_len - 1]) { + continue; + } + + /* compare final directory portion */ + if(pkgfile_len - 1 < rpath_bname_len || + (pkgfile_len - 2 >= rpath_bname_len && + pkgfile[pkgfile_len - 2 - rpath_bname_len] != '/') || + strncmp(pkgfile + pkgfile_len - 1 - rpath_bname_len, + rpath_bname, rpath_bname_len)) { + continue; + } + } + /* for files in '/', there is no directory name to match */ if(!rpath) { print_query_fileowner(filename, info); found = 1; - continue; + break; } if(rootlen + 1 + strlen(pkgfile) > PATH_MAX) { -- 1.7.10.2

2 3

[pacman-dev] [PATCH] Allow querying directory ownership
by Allan McRae 21 May '12

21 May '12

The restriction of not checking the ownership of a directory is unnecessary given that all the package filelists contain this information. Remove this restriction, with the expectation that you might get multiple packages returned for a given directory. Additionally attempt to minimise the number of files getting through to the slow realpath call. This combines ideas from two patches that have been around for a long time. Original-work-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Original-work-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Not having this feature is beginning to annoy me! Hopefully I have captured the important bits of both patches... src/pacman/query.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 464efbf..beaf76c 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -113,6 +113,7 @@ static int query_fileowner(alpm_list_t *targets) size_t rootlen; alpm_list_t *t; alpm_db_t *db_local; + alpm_list_t *packages; /* This code is here for safety only */ if(targets == NULL) { @@ -133,13 +134,14 @@ static int query_fileowner(alpm_list_t *targets) strcpy(path, root); db_local = alpm_get_localdb(config->handle); + packages = alpm_db_get_pkgcache(db_local); for(t = targets; t; t = alpm_list_next(t)) { char *filename, *dname, *rpath; const char *bname; struct stat buf; alpm_list_t *i; - int found = 0; + size_t found = 0, isdir, bname_len, dname_len; filename = strdup(t->data); @@ -162,16 +164,20 @@ static int query_fileowner(alpm_list_t *targets) } } - if(S_ISDIR(buf.st_mode)) { - pm_printf(ALPM_LOG_ERROR, - _("cannot determine ownership of directory '%s'\n"), filename); - ret++; - free(filename); - continue; + /* make sure directories have a trailing '/' */ + if((isdir = S_ISDIR(buf.st_mode))) { + size_t len = strlen(filename); + if(filename[len-1] != '/') { + filename = realloc(filename, sizeof(char) * (len + 2)); + strcat(filename, "/"); + } } bname = mbasename(filename); + bname_len = strlen(bname); dname = mdirname(filename); + dname_len = strlen(dname); + /* for files in '/', there is no directory name to match */ if(strcmp(dname, "") == 0) { rpath = NULL; @@ -190,7 +196,7 @@ static int query_fileowner(alpm_list_t *targets) } free(dname); - for(i = alpm_db_get_pkgcache(db_local); i && !found; i = alpm_list_next(i)) { + for(i = packages; i && (!found || isdir); i = alpm_list_next(i)) { alpm_pkg_t *info = i->data; alpm_filelist_t *filelist = alpm_pkg_get_files(info); size_t j; @@ -199,17 +205,27 @@ static int query_fileowner(alpm_list_t *targets) const alpm_file_t *file = filelist->files + j; char *ppath, *pdname; const char *pkgfile = file->name; + size_t pkgfile_len = strlen(pkgfile); - /* avoid the costly resolve_path usage if the basenames don't match */ - if(strcmp(mbasename(pkgfile), bname) != 0) { + /* avoid the costly resolve_path usage if the basenames don't match; + * we can also cheat by comparing the final characters first and avoid + * a full string comparison */ + if(!isdir && (pkgfile[pkgfile_len - 1] != bname[bname_len - 1] || + strcmp(mbasename(pkgfile), bname) != 0)) { continue; + } else if(isdir) { + /* database path needs trailing slash */ + if(pkgfile[pkgfile_len - 1] != '/' && + pkgfile[pkgfile_len - 2] != dname[dname_len - 2]) { + continue; + } } /* for files in '/', there is no directory name to match */ if(!rpath) { print_query_fileowner(filename, info); found = 1; - continue; + break; } if(rootlen + 1 + strlen(pkgfile) > PATH_MAX) { -- 1.7.10.2

1 1