From 160ee8ba9be23bc9dd7cc4853d749b5c818dfe6a Mon Sep 17 00:00:00 2001
From: evanokeeffe <evanokeeffe@gmail.com>
Date: Tue, 23 Mar 2021 12:49:26 +0000
Subject: [PATCH] found a bug in metacopy, the -x parameter wasn't in the
 optstring. rectified that

---
 samples/metacopy.cpp | 28 ++++++++++++++++------------
 samples/metacopy.hpp |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/samples/metacopy.cpp b/samples/metacopy.cpp
index 63f9d63e..9c34b15e 100644
--- a/samples/metacopy.cpp
+++ b/samples/metacopy.cpp
@@ -94,36 +94,40 @@ int Params::option(int opt, const std::string& /*optarg*/, int optopt)
 {
     int rc = 0;
     switch (opt) {
-    case 'h': help_ = true; break;
-    case 'i': iptc_ = true; break;
-    case 'e': exif_ = true; break;
-    case 'c': comment_ = true; break;
-    case 'x': xmp_ = true; break;
-    case 'p': preserve_ = true; break;
-    case 'a':
+    case 'h': {help_ = true; break;}
+    case 'i': {iptc_ = true; break;}
+    case 'e': {exif_ = true; break;}
+    case 'c': {comment_ = true; break;}
+    case 'x': {xmp_ = true; break;}
+    case 'p': {preserve_ = true; break;}
+    case 'a':{
         iptc_ =true;
         exif_ =true;
         comment_ =true;
         xmp_ =true;
         break;
-    case ':':
+    }
+    case ':':{
         std::cerr << progname() << ": Option -" << static_cast<char>(optopt)
                   << " requires an argument\n";
         rc = 1;
         break;
-    case '?':
+    }
+    case '?':{
         std::cerr << progname() << ": Unrecognized option -"
                   << static_cast<char>(optopt) << "\n";
         rc = 1;
         break;
-    default:
+    }
+    default:{
         std::cerr << progname()
                   << ": getopt returned unexpected character code "
                   << std::hex << opt << "\n";
         rc = 1;
         break;
     }
-
+    }
+    
     return rc;
 }
 
@@ -165,7 +169,7 @@ void Params::usage(std::ostream& os) const
 {
     os << "\nReads and writes raw metadata. Use -h option for help.\n"
        << "Usage: " << progname()
-       << " [-iecaph] readfile writefile\n";
+       << " [-iecxaph] readfile writefile\n";
 }
 
 void Params::help(std::ostream& os) const
diff --git a/samples/metacopy.hpp b/samples/metacopy.hpp
index 2e8b7305..3a1b9f98 100644
--- a/samples/metacopy.hpp
+++ b/samples/metacopy.hpp
@@ -39,7 +39,7 @@ public:
     /*!
       @brief Default constructor. Note that optstring_ is initialized here.
      */
-    Params() : optstring_(":iecaph"),
+    Params() : optstring_(":iecxaph"),
                first_(true),
                help_(false),
                iptc_(false),