update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / tools / ceph-dencoder / ceph_dencoder.cc

diff --git a/ceph/src/tools/ceph-dencoder/ceph_dencoder.cc b/ceph/src/tools/ceph-dencoder/ceph_dencoder.cc
index 53cf4c33696673cc3717495cda8b3c9927059775..87091561b39a3370b645a26ed654b76b48157948 100644 (file)
--- a/ceph/src/tools/ceph-dencoder/ceph_dencoder.cc
+++ b/ceph/src/tools/ceph-dencoder/ceph_dencoder.cc
@@ -42,6 +42,8 @@ void usage(ostream &out)
   out << "  encode              encode in-memory object\n";
   out << "  dump_json           dump in-memory object as json (to stdout)\n";
   out << "  hexdump             print encoded data in hex\n";
+  out << "  get_struct_v        print version of the encoded object\n";
+  out << "  get_struct_compat   print the oldest version of decoder that can decode the encoded object\n";
   out << "\n";
   out << "  copy                copy object (via operator=)\n";
   out << "  copy_ctor           copy object (via copy ctor)\n";
@@ -154,6 +156,10 @@ int main(int argc, const char **argv)
 
     } else if (*i == string("hexdump")) {
       encbl.hexdump(cout);
+    } else if (*i == string("get_struct_v")) {
+      std::cout << den->get_struct_v(encbl, 0) << std::endl;
+    } else if (*i == string("get_struct_compat")) {
+      std::cout << den->get_struct_v(encbl, sizeof(uint8_t)) << std::endl;
     } else if (*i == string("import")) {
       ++i;
       if (i == args.end()) {
@@ -179,7 +185,7 @@ int main(int argc, const char **argv)
        cerr << "expecting filename" << std::endl;
        exit(1);
       }
-      int fd = ::open(*i, O_WRONLY|O_CREAT|O_TRUNC, 0644);
+      int fd = ::open(*i, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644);
       if (fd < 0) {
        cerr << "error opening " << *i << " for write: " << cpp_strerror(errno) << std::endl;
        exit(1);