From aa1ee9be7a29497fbced1fb924ef0178dbb900a4 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 17 May 2012 17:30:35 -0700 Subject: [PATCH] cephtool: multiword admin socket commands Slurp up anything on the command line that isn't an option, so that you can do ceph --admin-socket /path/to/asok foo bar baz instead of ceph --admin-socket /path/to/asok 'foo bar baz' Signed-off-by: Sage Weil --- src/tools/ceph.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc index 5da84792fce49..8e824c79de7ae 100644 --- a/src/tools/ceph.cc +++ b/src/tools/ceph.cc @@ -76,7 +76,7 @@ static void parse_cmd_args(vector &args, *admin_socket = val; if (i == args.end()) usage(); - *admin_socket_cmd = *i; + *admin_socket_cmd = *i++; } else if (ceph_argparse_flag(args, i, "-s", "--status", (char*)NULL)) { *mode = CEPH_TOOL_MODE_STATUS; } else if (ceph_argparse_flag(args, i, "-w", "--watch", (char*)NULL)) { @@ -98,6 +98,9 @@ static void parse_cmd_args(vector &args, } else if (ceph_argparse_flag(args, i, "-h", "--help", (char*)NULL)) { usage(); } else { + if (admin_socket_cmd && admin_socket_cmd->length()) { + *admin_socket_cmd += " " + string(*i); + } ++i; } } -- 2.39.5