Merge pull request #140 from hussainnaqvee/patch-1

[awesomized/libmemcached] / src / bin / memcat.cc

diff --git a/src/bin/memcat.cc b/src/bin/memcat.cc
index ab8fc6db5ed959649128a35082841f872cda4ac7..3938bf134406b65384ca31d9157932dc55b6f74a 100644 (file)
--- a/src/bin/memcat.cc
+++ b/src/bin/memcat.cc
@@ -1,6 +1,6 @@
 /*
     +--------------------------------------------------------------------+
-    | libmemcached - C/C++ Client Library for memcached                  |
+    | libmemcached-awesome - C/C++ Client Library for memcached          |
     +--------------------------------------------------------------------+
     | Redistribution and use in source and binary forms, with or without |
     | modification, are permitted under the terms of the BSD license.    |
@@ -9,7 +9,7 @@
     | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
     +--------------------------------------------------------------------+
     | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
-    | Copyright (c) 2020 Michael Wallner   <mike@php.net>                |
+    | Copyright (c) 2020-2021 Michael Wallner        https://awesome.co/ |
     +--------------------------------------------------------------------+
 */
 
@@ -96,11 +96,16 @@ int main(int argc, char *argv[]) {
     exit(EXIT_FAILURE);
   }
 
+  auto file_flag = opt.isset("file");
+  auto file = opt.argof("file");
   auto exit_code = EXIT_SUCCESS;
   for (auto arg = argp; *arg; ++arg) {
     auto key = *arg;
     if (*key) {
-      char *file = opt.isset("file") ? (opt.argof("file") ?: key) : nullptr;
+      if (!file && file_flag) {
+        file = key;
+      }
+
       std::ofstream fstream{};
       std::ostream *ostream = check_ostream(opt, file, fstream);