sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

ctdb-tools: Add -x option to specify delimiter for machine readable output

Browse Source 
To support this, update printm() to replace ':' in format string with
options.machineseparator, which is a string but must contain a single
character.

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 17:15:21 +11:00 committed by Martin Schwenke
parent fbacbb9c78
commit 3b90e45bae
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,17 @@
<listitem>
<para>
Produce output in machine readable form for easier parsing
by scripts. Not all commands support this option.
by scripts. This uses a field delimiter of ':'. Not all
commands support this option.
</para>
</listitem>
</varlistentry>
<varlistentry><term>-x <parameter>SEPARATOR</parameter></term>
<listitem>
<para>
Use SEPARATOR to delimit fields in machine readable output.
This implies -Y.
</para>
</listitem>
</varlistentry>

32
ctdb/tools/ctdb.c
View File

@ -43,6 +43,7 @@ static struct {
uint32_t pnn;
uint32_t *nodes;
int machinereadable;
const char *machineseparator;
int verbose;
int maxruntime;
int printemptyrecords;
@ -75,9 +76,18 @@ static int printm(const char *format, ...)
{
va_list ap;
int ret;
size_t len = strlen(format);
char new_format[len+1];
strcpy(new_format, format);
if (options.machineseparator[0] != ':') {
all_string_sub(new_format,
":", options.machineseparator, len + 1);
}
va_start(ap, format);
ret = vprintf(format, ap);
ret = vprintf(new_format, ap);
va_end(ap);
return ret;
@ -6340,7 +6350,8 @@ static void usage(void)
"Usage: ctdb [options] <control>\n" \
"Options:\n" \
" -n <node> choose node number, or 'all' (defaults to local node)\n"
" -Y generate machinereadable output\n"
" -Y generate machine readable output\n"
" -x <char> specify delimiter for machine readable output\n"
" -v generate verbose output\n"
" -t <timelimit> set timelimit for control in seconds (default %u)\n", options.timelimit);
printf("Controls:\n");
@ -6372,7 +6383,8 @@ int main(int argc, const char *argv[])
POPT_CTDB_CMDLINE
{ "timelimit", 't', POPT_ARG_INT, &options.timelimit, 0, "timelimit", "integer" },
{ "node", 'n', POPT_ARG_STRING, &nodestring, 0, "node", "integer|all" },
{ "machinereadable", 'Y', POPT_ARG_NONE, &options.machinereadable, 0, "enable machinereadable 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" },
{ "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" },
{ "print-emptyrecords", 0, POPT_ARG_NONE, &options.printemptyrecords, 0, "print the empty records when dumping databases (catdb, cattdb, dumpdbbackup)", NULL },
@ -6430,6 +6442,20 @@ int main(int argc, const char *argv[])
}
}
if (options.machineseparator != NULL) {
if (strlen(options.machineseparator) != 1) {
printf("Invalid separator \"%s\" - "
"must be single character\n",
options.machineseparator);
exit(1);
}
/* -x implies -Y */
options.machinereadable = true;
} else if (options.machinereadable) {
options.machineseparator = ":";
}
signal(SIGALRM, ctdb_alarm);
alarm(options.maxruntime);