bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util.c: extend --print-format with %C, %D, %M

Browse source 
Extend print-format with checkdepends, depends and makedepends.

Signed-off-by: Jelle van der Waa <jelle@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Jelle van der Waa 2022-03-26 16:54:22 +01:00 • committed by Allan McRae
parent 00bc386d5a
commit cb9776a07b
2 changed files with 51 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/pacman.8.asciidoc
View file

@ -239,7 +239,8 @@ Transaction Options (apply to '-S', '-R' and '-U')
builddate, "%d" for description, "%e" for pkgbase, "%f" for filename, builddate, "%d" for description, "%e" for pkgbase, "%f" for filename,
"%g" for base64 encoded PGP signature, "%h" for sha256sum, "%n" for "%g" for base64 encoded PGP signature, "%h" for sha256sum, "%n" for
pkgname, "%p" for packager, "%v" for pkgver, "%l" for location, "%r" pkgname, "%p" for packager, "%v" for pkgver, "%l" for location, "%r"
for repository, and "%s" for size. for repository, "%s" for size, "%C" for checkdepends, "%D" for depends
and "%M" for makedepends.
Implies '\--print'. Implies '\--print'.

49
src/pacman/util.c
View file

@ -405,6 +405,28 @@ char *strreplace(const char *str, const char *needle, const char *replace)
return newstr; return newstr;
} }
static char *concat_alpm_depends(alpm_list_t *lst)
{
char *depends = NULL;
char *tmp = NULL;
for(alpm_list_t *i = lst; i; i = alpm_list_next(i)) {
alpm_depend_t *dep = i->data;
char *depstring = alpm_dep_compute_string(dep);
if(tmp) {
asprintf(&depends, "%s %s", tmp, depstring);
free(tmp);
} else {
asprintf(&depends, "%s", depstring);
}
tmp = depends;
free(depstring);
}
if(!depends) {
asprintf(&depends, "%s", "");
}
return depends;
}
static size_t string_length(const char *s) static size_t string_length(const char *s)
{ {
int len; int len;
@ -1219,6 +1241,33 @@ void print_packages(const alpm_list_t *packages)
} }
/* %u : url */ /* %u : url */
VAL_FROM_FORMAT_STR(temp, "%u", alpm_pkg_get_url) VAL_FROM_FORMAT_STR(temp, "%u", alpm_pkg_get_url)
/* %C : checkdepends */
if(strstr(temp, "%C")) {
alpm_list_t *lst = alpm_pkg_get_checkdepends(pkg);
char *depends = concat_alpm_depends(lst);
string = strreplace(temp, "%C", lst ? depends : "");
free(depends);
free(temp);
temp = string;
}
/* %D : depends */
if(strstr(temp, "%D")) {
alpm_list_t *lst = alpm_pkg_get_depends(pkg);
char *depends = concat_alpm_depends(lst);
string = strreplace(temp, "%D", depends);
free(depends);
free(temp);
temp = string;
}
/* %M : makedepends */
if(strstr(temp, "%M")) {
alpm_list_t *lst = alpm_pkg_get_makedepends(pkg);
char *depends = concat_alpm_depends(lst);
string = strreplace(temp, "%M", depends);
free(depends);
free(temp);
temp = string;
}
printf("%s\n", string); printf("%s\n", string);
free(string); free(string);
} }