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

xbps-query: align correctly -l results (state wasn't taken into account).

Browse Source
This commit is contained in:
Juan RP 2013-02-11 11:04:25 +01:00
parent 2b5d3bb8f4
commit 9c3cb200d4
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2008-2012 Juan Romero Pardines. * Copyright (c) 2008-2013 Juan Romero Pardines.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -58,7 +58,7 @@ list_pkgs_in_dict(struct xbps_handle *xhp,
struct list_pkgver_cb *lpc = arg; struct list_pkgver_cb *lpc = arg;
const char *pkgver, *short_desc, *state_str; const char *pkgver, *short_desc, *state_str;
char tmp[255], *out = NULL; char tmp[255], *out = NULL;
size_t i, len = 0, maxcols; size_t i, len = 0;
pkg_state_t state; pkg_state_t state;
(void)xhp; (void)xhp;
@ -85,13 +85,14 @@ list_pkgs_in_dict(struct xbps_handle *xhp,
tmp[i] = ' '; tmp[i] = ' ';
tmp[i] = '\0'; tmp[i] = '\0';
maxcols = lpc->maxcols - 4; len = strlen(tmp) + strlen(short_desc) + 2;
len = strlen(tmp) + strlen(short_desc); if (len > lpc->maxcols) {
if (len > maxcols) { out = malloc(lpc->maxcols+1);
out = malloc(lpc->maxcols);
assert(out); assert(out);
snprintf(out, maxcols, "%s %s", tmp, short_desc); snprintf(out, lpc->maxcols - 3,
printf("%s...\n", out); "%s %s", tmp, short_desc);
strncat(out, "...\n", lpc->maxcols);
printf("%s", out);
free(out); free(out);
} else { } else {
printf("%s %s\n", tmp, short_desc); printf("%s %s\n", tmp, short_desc);
@ -154,7 +155,7 @@ 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); lpc.pkgver_len = find_longest_pkgver(xhp, NULL) + 3; /* for state */
lpc.maxcols = get_maxcols(); lpc.maxcols = get_maxcols();
return xbps_pkgdb_foreach_cb(xhp, list_pkgs_in_dict, &lpc); return xbps_pkgdb_foreach_cb(xhp, list_pkgs_in_dict, &lpc);
@ -200,6 +201,7 @@ _find_longest_pkgver_cb(struct xbps_handle *xhp,
struct fflongest *ffl = arg; struct fflongest *ffl = arg;
prop_dictionary_t pkgd; prop_dictionary_t pkgd;
const char *pkgver; const char *pkgver;
size_t len;
(void)xhp; (void)xhp;
(void)loop_done; (void)loop_done;
@ -210,8 +212,9 @@ _find_longest_pkgver_cb(struct xbps_handle *xhp,
pkgd = obj; pkgd = obj;
prop_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver); prop_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver);
if (ffl->len == 0 || strlen(pkgver) > ffl->len) len = strlen(pkgver);
ffl->len = strlen(pkgver); if (ffl->len == 0 || len > ffl->len)
ffl->len = len;
return 0; return 0;
} }