summaryrefslogtreecommitdiffstats
path: root/cli/src/cli.c
diff options
context:
space:
mode:
authorAmar Tumballi <amarts@redhat.com>2012-04-23 11:11:43 +0530
committerVijay Bellur <vijay@gluster.com>2012-04-25 00:45:51 -0700
commit3f35280a364bd35293d3e5804eb2a659a7f174b1 (patch)
treee400432d3460aaacbdc4e6675978bd1c2c94e4ef /cli/src/cli.c
parent90d5d569b5a2333094ba8741bb29fe040b695b23 (diff)
cli: implement a fn 'cli_err()' to send error messages to 'stderr'
we were using 'cli_out()' to send all the possible msgs, which is not very friendly with scripts, because if one want to get only valid output with "<command> 2>/error.log 1>/proper-info.log" Change-Id: I008ebcbd90935c41dbfc1bd2adeb094ed21116cb Signed-off-by: Amar Tumballi <amarts@redhat.com> BUG: 815194 Reviewed-on: http://review.gluster.com/3208 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaushal M <kaushal@redhat.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'cli/src/cli.c')
-rw-r--r--cli/src/cli.c26
1 files changed, 25 insertions, 1 deletions
diff --git a/cli/src/cli.c b/cli/src/cli.c
index 7a490fed2..6a5ecf698 100644
--- a/cli/src/cli.c
+++ b/cli/src/cli.c
@@ -450,11 +450,35 @@ cli_usage_out (const char *usage)
if (!usage || usage[0] == '\0')
return -1;
- cli_out ("Usage: %s", usage);
+ cli_err ("Usage: %s", usage);
return 0;
}
int
+_cli_err (const char *fmt, ...)
+{
+ struct cli_state *state = NULL;
+ va_list ap;
+ int ret = 0;
+
+ state = global_state;
+
+ va_start (ap, fmt);
+
+#ifdef HAVE_READLINE
+ if (state->rl_enabled && !state->rl_processing)
+ return cli_rl_err(state, fmt, ap);
+#endif
+
+ ret = vfprintf (stderr, fmt, ap);
+ fprintf (stderr, "\n");
+ va_end (ap);
+
+ return ret;
+}
+
+
+int
_cli_out (const char *fmt, ...)
{
struct cli_state *state = NULL;