From 3bfd9e4a0fbdfc7175a65813888e739f6b6daa60 Mon Sep 17 00:00:00 2001 From: Li Wang Date: Fri, 20 Apr 2018 08:49:15 +0000 Subject: [PATCH] tools/rados: improve the ls command usage Signed-off-by: Li Wang --- src/tools/rados/rados.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc index 88443e40ce67..9834eb021022 100644 --- a/src/tools/rados/rados.cc +++ b/src/tools/rados/rados.cc @@ -2211,12 +2211,17 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, if (wildcard) io_ctx.set_namespace(all_nspaces); - bool use_stdout = (nargs.size() < 2) || (strcmp(nargs[1], "-") == 0); + bool use_stdout = (!output && (nargs.size() < 2 || (strcmp(nargs[1], "-") == 0))); + if (!use_stdout && !output) { + cerr << "Please use --output to specify the output file name" << std::endl; + ret = -1; + goto out; + } ostream *outstream; if(use_stdout) outstream = &cout; else - outstream = new ofstream(nargs[1]); + outstream = new ofstream(output); { if (formatter) -- 2.47.3