proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-13 21:47:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1201 from brauner/2016-09-21/lxc_ls_no_spaces

Browse Source 
tools: do not add trailing spaces on lxc-ls -1
This commit is contained in:
Stéphane Graber 2016-09-21 15:34:34 -04:00 committed by GitHub
commit 2b8640dfbf
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lxc/tools/lxc_ls.c
View File

@ -144,7 +144,7 @@ static void ls_print_fancy_format(struct ls *l, struct lengths *lht,
* Only print names of containers. * Only print names of containers.
*/ */
static void ls_print_names(struct ls *l, struct lengths *lht, static void ls_print_names(struct ls *l, struct lengths *lht,
size_t ls_arr, size_t termwidth); size_t ls_arr, size_t termwidth, bool list);
/* /*
* Print default fancy format. * Print default fancy format.
@ -264,7 +264,7 @@ int main(int argc, char *argv[])
unsigned int cols = 0; unsigned int cols = 0;
if (!my_args.ls_line) if (!my_args.ls_line)
cols = ls_get_term_width(); cols = ls_get_term_width();
ls_print_names(ls_arr, &max_len, ls_size, cols); ls_print_names(ls_arr, &max_len, ls_size, cols, my_args.ls_line);
} }
ret = EXIT_SUCCESS; ret = EXIT_SUCCESS;
@ -743,7 +743,7 @@ static struct ls *ls_new(struct ls **ls, size_t *size)
} }
static void ls_print_names(struct ls *l, struct lengths *lht, static void ls_print_names(struct ls *l, struct lengths *lht,
size_t size, size_t termwidth) size_t size, size_t termwidth, bool list)
{ {
/* If list is empty do nothing. */ /* If list is empty do nothing. */
if (size == 0) if (size == 0)
@ -752,14 +752,18 @@ static void ls_print_names(struct ls *l, struct lengths *lht,
size_t i, len = 0; size_t i, len = 0;
struct ls *m = NULL; struct ls *m = NULL;
for (i = 0, m = l; i < size; i++, m++) { for (i = 0, m = l; i < size; i++, m++) {
printf("%-*s", lht->name_length, m->name ? m->name : "-"); if (list) {
len += lht->name_length; printf("%s\n", m->name ? m->name : "-");
if ((len + lht->name_length) >= termwidth) {
printf("\n");
len = 0;
} else { } else {
printf(" "); printf("%-*s", lht->name_length, m->name ? m->name : "-");
len++; len += lht->name_length;
if ((len + lht->name_length) >= termwidth) {
printf("\n");
len = 0;
} else {
printf(" ");
len++;
}
} }
} }
if (len > 0) if (len > 0)