shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

Merge pull request #14525 from yuwata/mount-use-format-table

Browse Source 
systemd-mount: use format-table.[ch]
This commit is contained in:
Lennart Poettering 2020-01-09 15:47:24 +01:00 committed by GitHub
commit 8ac7339648
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
man/systemd-mount.xml
View File

@ -96,6 +96,7 @@
</varlistentry>
<xi:include href="standard-options.xml" xpointer="no-pager"/>
<xi:include href="standard-options.xml" xpointer="no-legend" />
<xi:include href="standard-options.xml" xpointer="no-ask-password"/>
<varlistentry>

116
src/mount/mount-tool.c
View File

@ -14,6 +14,7 @@
#include "escape.h"
#include "fd-util.h"
#include "fileio.h"
#include "format-table.h"
#include "format-util.h"
#include "fs-util.h"
#include "fstab-util.h"
@ -44,6 +45,7 @@ enum {
static bool arg_no_block = false;
static PagerFlags arg_pager_flags = 0;
static bool arg_legend = true;
static bool arg_ask_password = true;
static bool arg_quiet = false;
static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
@ -89,6 +91,7 @@ static int help(void) {
" --version Show package version\n"
" --no-block Do not wait until operation finished\n"
" --no-pager Do not pipe output into a pager\n"
" --no-legend Do not show the headers\n"
" --no-ask-password Do not prompt for password\n"
" -q --quiet Suppress information messages during runtime\n"
" --user Run as user unit\n"
@ -124,6 +127,7 @@ static int parse_argv(int argc, char *argv[]) {
ARG_VERSION = 0x100,
ARG_NO_BLOCK,
ARG_NO_PAGER,
ARG_NO_LEGEND,
ARG_NO_ASK_PASSWORD,
ARG_USER,
ARG_SYSTEM,
@ -145,6 +149,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "version", no_argument, NULL, ARG_VERSION },
{ "no-block", no_argument, NULL, ARG_NO_BLOCK },
{ "no-pager", no_argument, NULL, ARG_NO_PAGER },
{ "no-legend", no_argument, NULL, ARG_NO_LEGEND },
{ "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD },
{ "quiet", no_argument, NULL, 'q' },
{ "user", no_argument, NULL, ARG_USER },
@ -195,6 +200,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_pager_flags |= PAGER_DISABLE;
break;
case ARG_NO_LEGEND:
arg_legend = false;
break;
case ARG_NO_ASK_PASSWORD:
arg_ask_password = false;
break;
@ -1361,44 +1370,13 @@ enum {
_COLUMN_MAX,
};
struct item {
char* columns[_COLUMN_MAX];
};
static int compare_item(const struct item *a, const struct item *b) {
if (a->columns[COLUMN_NODE] == b->columns[COLUMN_NODE])
return 0;
if (!a->columns[COLUMN_NODE])
return 1;
if (!b->columns[COLUMN_NODE])
return -1;
return path_compare(a->columns[COLUMN_NODE], b->columns[COLUMN_NODE]);
}
static int list_devices(void) {
static const char * const titles[_COLUMN_MAX] = {
[COLUMN_NODE] = "NODE",
[COLUMN_PATH] = "PATH",
[COLUMN_MODEL] = "MODEL",
[COLUMN_WWN] = "WWN",
[COLUMN_FSTYPE] = "TYPE",
[COLUMN_LABEL] = "LABEL",
[COLUMN_UUID] = "UUID"
};
_cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
size_t n_allocated = 0, n = 0, i;
size_t column_width[_COLUMN_MAX];
struct item *items = NULL;
_cleanup_(table_unrefp) Table *table = NULL;
sd_device *d;
unsigned c;
int r;
for (c = 0; c < _COLUMN_MAX; c++)
column_width[c] = strlen(titles[c]);
r = sd_device_enumerator_new(&e);
if (r < 0)
return log_oom();
@ -1411,19 +1389,19 @@ static int list_devices(void) {
if (r < 0)
return log_error_errno(r, "Failed to add property match: %m");
table = table_new("NODE", "PATH", "MODEL", "WWN", "TYPE", "LABEL", "UUID");
if (!table)
return log_oom();
r = table_set_sort(table, 0, SIZE_MAX);
if (r < 0)
return log_error_errno(r, "Failed to set sort index: %m");
table_set_header(table, arg_legend);
FOREACH_DEVICE(e, d) {
struct item *j;
if (!GREEDY_REALLOC0(items, n_allocated, n+1)) {
r = log_oom();
goto finish;
}
j = items + n++;
for (c = 0; c < _COLUMN_MAX; c++) {
const char *x = NULL;
size_t k;
switch (c) {
@ -1456,59 +1434,19 @@ static int list_devices(void) {
break;
}
if (isempty(x))
continue;
j->columns[c] = strdup(x);
if (!j->columns[c]) {
r = log_oom();
goto finish;
}
k = strlen(x);
if (k > column_width[c])
column_width[c] = k;
r = table_add_cell(table, NULL, c == COLUMN_NODE ? TABLE_PATH : TABLE_STRING, strna(x));
if (r < 0)
return log_error_errno(r, "Failed to add cell: %m");
}
}
if (n == 0) {
log_info("No devices found.");
goto finish;
}
typesafe_qsort(items, n, compare_item);
(void) pager_open(arg_pager_flags);
fputs(ansi_underline(), stdout);
for (c = 0; c < _COLUMN_MAX; c++) {
if (c > 0)
fputc(' ', stdout);
r = table_print(table, NULL);
if (r < 0)
return log_error_errno(r, "Failed to print table: %m");
printf("%-*s", (int) column_width[c], titles[c]);
}
fputs(ansi_normal(), stdout);
fputc('\n', stdout);
for (i = 0; i < n; i++) {
for (c = 0; c < _COLUMN_MAX; c++) {
if (c > 0)
fputc(' ', stdout);
printf("%-*s", (int) column_width[c], strna(items[i].columns[c]));
}
fputc('\n', stdout);
}
r = 0;
finish:
for (i = 0; i < n; i++)
for (c = 0; c < _COLUMN_MAX; c++)
free(items[i].columns[c]);
free(items);
return r;
return 0;
}
static int run(int argc, char* argv[]) {

8
src/shared/format-table.c
View File

@ -14,6 +14,7 @@
#include "memory-util.h"
#include "pager.h"
#include "parse-util.h"
#include "path-util.h"
#include "pretty-print.h"
#include "sort-util.h"
#include "string-util.h"
@ -234,6 +235,7 @@ static size_t table_data_size(TableDataType type, const void *data) {
return 0;
case TABLE_STRING:
case TABLE_PATH:
return strlen(data) + 1;
case TABLE_BOOLEAN:
@ -768,6 +770,7 @@ int table_add_many_internal(Table *t, TableDataType first_type, ...) {
break;
case TABLE_STRING:
case TABLE_PATH:
data = va_arg(ap, const char *);
break;
@ -1038,6 +1041,9 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t
case TABLE_STRING:
return strcmp(a->string, b->string);
case TABLE_PATH:
return path_compare(a->string, b->string);
case TABLE_BOOLEAN:
if (!a->boolean && b->boolean)
return -1;
@ -1151,6 +1157,7 @@ static const char *table_data_format(Table *t, TableData *d) {
return strempty(t->empty_string);
case TABLE_STRING:
case TABLE_PATH:
if (d->uppercase) {
char *p, *q;
@ -1897,6 +1904,7 @@ static int table_data_to_json(TableData *d, JsonVariant **ret) {
return json_variant_new_null(ret);
case TABLE_STRING:
case TABLE_PATH:
return json_variant_new_string(ret, d->string);
case TABLE_BOOLEAN:

1
src/shared/format-table.h
View File

@ -11,6 +11,7 @@
typedef enum TableDataType {
TABLE_EMPTY,
TABLE_STRING,
TABLE_PATH,
TABLE_BOOLEAN,
TABLE_TIMESTAMP,
TABLE_TIMESTAMP_UTC,