emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-query(8): ownedby: do not follow symlinks and print target file too.

Browse Source
This commit is contained in:
Juan RP 2015-01-29 17:32:14 +01:00
parent 20276fc068
commit 0c208bb744
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@ -1,5 +1,11 @@
xbps-0.44 (???): xbps-0.44 (???):
* xbps-query(8): in the ownedby mode, do not follow symbolic links and if the
matching file is a symlink print its target file too:
$ xbps-query -o `which whatis`
mdocml-1.13.2_5: /usr/bin/whatis -> /usr/bin/mandoc (link)
* xbps-install(8): add additional actions to the column output: "downgrade" * xbps-install(8): add additional actions to the column output: "downgrade"
and "reinstall", as well as current installed version and new version. and "reinstall", as well as current installed version and new version.
Implement https://github.com/voidlinux/xbps/issues/72 Implement https://github.com/voidlinux/xbps/issues/72

25
bin/xbps-query/ownedby.c
View File

@ -51,8 +51,7 @@ match_files_by_pattern(xbps_dictionary_t pkg_filesd,
const char *pkgver) const char *pkgver)
{ {
xbps_array_t array; xbps_array_t array;
xbps_object_t obj; const char *keyname, *typestr;
const char *keyname, *filestr, *typestr;
keyname = xbps_dictionary_keysym_cstring_nocopy(key); keyname = xbps_dictionary_keysym_cstring_nocopy(key);
@ -67,18 +66,28 @@ match_files_by_pattern(xbps_dictionary_t pkg_filesd,
array = xbps_dictionary_get_keysym(pkg_filesd, key); array = xbps_dictionary_get_keysym(pkg_filesd, key);
for (unsigned int i = 0; i < xbps_array_count(array); i++) { for (unsigned int i = 0; i < xbps_array_count(array); i++) {
xbps_object_t obj;
const char *filestr = NULL, *tgt = NULL;
obj = xbps_array_get(array, i); obj = xbps_array_get(array, i);
filestr = NULL;
xbps_dictionary_get_cstring_nocopy(obj, "file", &filestr); xbps_dictionary_get_cstring_nocopy(obj, "file", &filestr);
if (filestr == NULL) if (filestr == NULL)
continue; continue;
xbps_dictionary_get_cstring_nocopy(obj, "target", &tgt);
if (ffd->rematch) { if (ffd->rematch) {
if (regexec(&ffd->regex, filestr, 0, 0, 0) == 0) { if (regexec(&ffd->regex, filestr, 0, 0, 0) == 0) {
printf("%s: %s (%s)\n", pkgver, filestr, typestr); printf("%s: %s ", pkgver, filestr);
if (tgt)
printf("-> %s ", tgt);
printf("(%s)\n", typestr);
} }
} else { } else {
if ((fnmatch(ffd->pat, filestr, FNM_PERIOD)) == 0) if ((fnmatch(ffd->pat, filestr, FNM_PERIOD)) == 0) {
printf("%s: %s (%s)\n", pkgver, filestr, typestr); printf("%s: %s ", pkgver, filestr);
if (tgt)
printf("-> %s ", tgt);
printf("(%s)\n", typestr);
}
} }
} }
} }
@ -170,15 +179,11 @@ int
ownedby(struct xbps_handle *xhp, const char *pat, bool repo, bool regex) ownedby(struct xbps_handle *xhp, const char *pat, bool repo, bool regex)
{ {
struct ffdata ffd; struct ffdata ffd;
char *rfile;
int rv; int rv;
ffd.rematch = false; ffd.rematch = false;
ffd.pat = pat; ffd.pat = pat;
if ((rfile = realpath(pat, NULL)) != NULL)
ffd.pat = rfile;
if (regex) { if (regex) {
ffd.rematch = true; ffd.rematch = true;
if (regcomp(&ffd.regex, ffd.pat, REG_EXTENDED|REG_NOSUB|REG_ICASE) != 0) if (regcomp(&ffd.regex, ffd.pat, REG_EXTENDED|REG_NOSUB|REG_ICASE) != 0)