d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bectl(8): Some light cleanup and commenting

Browse Source
This commit is contained in:
Kyle Evans 2018-08-05 20:03:05 +00:00
parent 96c5db5854
commit 9a460e6fd2
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sbin/bectl/bectl.c
View File

@ -462,6 +462,7 @@ static void
print_padding(const char *fval, int colsz, struct printc *pc) print_padding(const char *fval, int colsz, struct printc *pc)
{ {
/* -H flag handling; all delimiters/padding are a single tab */
if (pc->script_fmt) { if (pc->script_fmt) {
printf("\t"); printf("\t");
return; return;
@ -484,6 +485,7 @@ dataset_space(const char *oname)
if (dsname == NULL) if (dsname == NULL)
return (0); return (0);
/* Truncate snapshot to dataset name, as needed */
if ((sep = strchr(dsname, '@')) != NULL) if ((sep = strchr(dsname, '@')) != NULL)
*sep = '\0'; *sep = '\0';
@ -552,6 +554,12 @@ print_info(const char *name, nvlist_t *dsprops, struct printc *pc)
if (dsname == NULL) if (dsname == NULL)
/* XXX TODO: Error? */ /* XXX TODO: Error? */
return; return;
/*
* Whether we're dealing with -a or -s, we'll always print the
* dataset name/information followed by its origin. For -s, we
* additionally iterate through all snapshots of this boot
* environment and also print their information.
*/
pc->current_indent += INDENT_INCREMENT; pc->current_indent += INDENT_INCREMENT;
print_info(dsname, dsprops, pc); print_info(dsname, dsprops, pc);
pc->current_indent += INDENT_INCREMENT; pc->current_indent += INDENT_INCREMENT;
@ -594,16 +602,23 @@ print_info(const char *name, nvlist_t *dsprops, struct printc *pc)
} }
oname = get_origin_props(dsprops, &originprops); oname = get_origin_props(dsprops, &originprops);
if (nvlist_lookup_string(dsprops, "used", &propstr) == 0) { if (nvlist_lookup_string(dsprops, "used", &propstr) == 0) {
/*
* The space used column is some composition of:
* - The "used" property of the dataset
* - The "used" property of the origin snapshot (not -a or -s)
* - The "used" property of the origin dataset (-D flag only)
*
* The -D flag is ignored if -a or -s are specified.
*/
space = strtoull(propstr, NULL, 10); space = strtoull(propstr, NULL, 10);
if (!pc->show_all_datasets && originprops != NULL && if (!pc->show_all_datasets && !pc->show_snaps &&
originprops != NULL &&
nvlist_lookup_string(originprops, "used", &propstr) == 0) nvlist_lookup_string(originprops, "used", &propstr) == 0)
space += strtoull(propstr, NULL, 10); space += strtoull(propstr, NULL, 10);
if (!pc->show_all_datasets && pc->show_space && oname != NULL) if (pc->show_space && oname != NULL)
/* Get the used space of the origin's dataset, too. */
space += dataset_space(oname); space += dataset_space(oname);
/* Alas, there's more to it,. */ /* Alas, there's more to it,. */
@ -611,7 +626,7 @@ print_info(const char *name, nvlist_t *dsprops, struct printc *pc)
printf("%s", buf); printf("%s", buf);
print_padding(buf, pc->space_colsz, pc); print_padding(buf, pc->space_colsz, pc);
} else { } else {
printf("%s", "-"); printf("-");
print_padding("-", pc->space_colsz, pc); print_padding("-", pc->space_colsz, pc);
} }
@ -723,6 +738,9 @@ bectl_cmd_list(int argc, char *argv[])
return (1); return (1);
} }
/* Force -D off if either -a or -s are specified */
if (pc.show_all_datasets || pc.show_snaps)
pc.show_space = false;
if (!pc.script_fmt) if (!pc.script_fmt)
print_headers(props, &pc); print_headers(props, &pc);
/* Do a first pass to print active and next active first */ /* Do a first pass to print active and next active first */