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

bin/xbps-query: simplify list printing (with truncation)

Browse Source
This commit is contained in:
Duncan Overbruck 2020-04-18 17:46:23 +02:00 committed by Juan RP
parent a2c7f5fc29
commit 910bb5674c
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
bin/xbps-query/list.c
View File

@ -35,6 +35,7 @@
struct list_pkgver_cb { struct list_pkgver_cb {
unsigned int pkgver_len; unsigned int pkgver_len;
unsigned int maxcols; unsigned int maxcols;
char *linebuf;
}; };
int int
@ -46,8 +47,7 @@ list_pkgs_in_dict(struct xbps_handle *xhp UNUSED,
{ {
struct list_pkgver_cb *lpc = arg; struct list_pkgver_cb *lpc = arg;
const char *pkgver = NULL, *short_desc = NULL, *state_str = NULL; const char *pkgver = NULL, *short_desc = NULL, *state_str = NULL;
char tmp[255], *out = NULL; unsigned int len;
unsigned int i, len = 0;
pkg_state_t state; pkg_state_t state;
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver); xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
@ -66,24 +66,26 @@ list_pkgs_in_dict(struct xbps_handle *xhp UNUSED,
else else
state_str = "??"; state_str = "??";
snprintf(tmp, sizeof(tmp), "%s %s", state_str, pkgver); if (lpc->linebuf == NULL) {
for (i = strlen(pkgver) + 3; i < lpc->pkgver_len; i++) printf("%s %-*s %s\n",
tmp[i] = ' '; state_str,
lpc->pkgver_len, pkgver,
tmp[i] = '\0'; short_desc);
len = strlen(tmp) + strlen(short_desc) + 2; return 0;
if (lpc->maxcols && len > lpc->maxcols) {
out = malloc(lpc->maxcols+1);
assert(out);
snprintf(out, lpc->maxcols - 3,
"%s %s", tmp, short_desc);
xbps_strlcat(out, "...\n", lpc->maxcols+1);
printf("%s", out);
free(out);
} else {
printf("%s %s\n", tmp, short_desc);
} }
len = snprintf(lpc->linebuf, lpc->maxcols, "%s %-*s %s",
state_str,
lpc->pkgver_len, pkgver,
short_desc);
/* add ellipsis if the line was truncated */
if (len >= lpc->maxcols && lpc->maxcols > 4) {
for (unsigned int j = 0; j < 3; j++)
lpc->linebuf[lpc->maxcols-j-1] = '.';
lpc->linebuf[lpc->maxcols] = '\0';
}
puts(lpc->linebuf);
return 0; return 0;
} }
@ -164,8 +166,14 @@ list_pkgs_pkgdb(struct xbps_handle *xhp)
{ {
struct list_pkgver_cb lpc; struct list_pkgver_cb lpc;
lpc.pkgver_len = find_longest_pkgver(xhp, NULL) + 3; /* for state */ lpc.pkgver_len = find_longest_pkgver(xhp, NULL);
lpc.maxcols = get_maxcols(); lpc.maxcols = get_maxcols();
lpc.linebuf = NULL;
if (lpc.maxcols > 0) {
lpc.linebuf = malloc(lpc.maxcols);
if (lpc.linebuf == NULL)
exit(1);
}
return xbps_pkgdb_foreach_cb(xhp, list_pkgs_in_dict, &lpc); return xbps_pkgdb_foreach_cb(xhp, list_pkgs_in_dict, &lpc);
} }