sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

ctdb-tools: Add -X option for machine parsable output with separator '|'

Browse Source 
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2014-11-19 18:19:50 +11:00 committed by Martin Schwenke
parent 3b90e45bae
commit 7428f809a7
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ctdb/doc/ctdb.1.xml
View File

@ -152,6 +152,20 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry><term>-X</term>
<listitem>
<para>
Produce output in machine readable form for easier parsing
by scripts. This uses a field delimiter of '|'. Not all
commands support this option.
</para>
<para>
This is equivalent to "-x|" and avoids some shell quoting
issues.
</para>
</listitem>
</varlistentry>
<varlistentry><term>-t <parameter>TIMEOUT</parameter></term> <varlistentry><term>-t <parameter>TIMEOUT</parameter></term>
<listitem> <listitem>
<para> <para>

5
ctdb/tools/ctdb.c
View File

@ -6378,6 +6378,7 @@ int main(int argc, const char *argv[])
{ {
struct ctdb_context *ctdb; struct ctdb_context *ctdb;
char *nodestring = NULL; char *nodestring = NULL;
int machineparsable = 0;
struct poptOption popt_options[] = { struct poptOption popt_options[] = {
POPT_AUTOHELP POPT_AUTOHELP
POPT_CTDB_CMDLINE POPT_CTDB_CMDLINE
@ -6385,6 +6386,7 @@ int main(int argc, const char *argv[])
{ "node", 'n', POPT_ARG_STRING, &nodestring, 0, "node", "integer|all" }, { "node", 'n', POPT_ARG_STRING, &nodestring, 0, "node", "integer|all" },
{ "machinereadable", 'Y', POPT_ARG_NONE, &options.machinereadable, 0, "enable machine readable output", NULL }, { "machinereadable", 'Y', POPT_ARG_NONE, &options.machinereadable, 0, "enable machine readable output", NULL },
{ NULL, 'x', POPT_ARG_STRING, &options.machineseparator, 0, "specify separator for machine readable output", "char" }, { NULL, 'x', POPT_ARG_STRING, &options.machineseparator, 0, "specify separator for machine readable output", "char" },
{ NULL, 'X', POPT_ARG_NONE, &machineparsable, 0, "enable machine parsable output with separator |", NULL },
{ "verbose", 'v', POPT_ARG_NONE, &options.verbose, 0, "enable verbose output", NULL }, { "verbose", 'v', POPT_ARG_NONE, &options.verbose, 0, "enable verbose output", NULL },
{ "maxruntime", 'T', POPT_ARG_INT, &options.maxruntime, 0, "die if runtime exceeds this limit (in seconds)", "integer" }, { "maxruntime", 'T', POPT_ARG_INT, &options.maxruntime, 0, "die if runtime exceeds this limit (in seconds)", "integer" },
{ "print-emptyrecords", 0, POPT_ARG_NONE, &options.printemptyrecords, 0, "print the empty records when dumping databases (catdb, cattdb, dumpdbbackup)", NULL }, { "print-emptyrecords", 0, POPT_ARG_NONE, &options.printemptyrecords, 0, "print the empty records when dumping databases (catdb, cattdb, dumpdbbackup)", NULL },
@ -6442,6 +6444,9 @@ int main(int argc, const char *argv[])
} }
} }
if (machineparsable) {
options.machineseparator = "|";
}
if (options.machineseparator != NULL) { if (options.machineseparator != NULL) {
if (strlen(options.machineseparator) != 1) { if (strlen(options.machineseparator) != 1) {
printf("Invalid separator \"%s\" - " printf("Invalid separator \"%s\" - "