From: Adam Kupczyk <akupczyk@redhat.com>
Date: Mon, 26 Nov 2018 14:52:35 +0000 (+0100)
Subject: bluestore/tools: fix arguments after global_init accepts and removes some
X-Git-Tag: v14.1.0~723^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=36764109887ccd97972d2ca14f60d8ee063f4157;p=ceph-ci.git

bluestore/tools: fix arguments after global_init accepts and removes some

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
---

diff --git a/src/tools/ceph_kvstore_tool.cc b/src/tools/ceph_kvstore_tool.cc
index 4198f09a5d2..4f73b1ea8e8 100644
--- a/src/tools/ceph_kvstore_tool.cc
+++ b/src/tools/ceph_kvstore_tool.cc
@@ -336,6 +336,10 @@ int main(int argc, const char *argv[])
     CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);
 
+  ceph_assert((int)args.size() < argc);
+  for(size_t i=0; i<args.size(); i++)
+    argv[i+1] = args[i];
+  argc = args.size() + 1;
 
   if (args.size() < 3) {
     usage(argv[0]);