util: simplify string splitting

diff --git a/cmdline.cc b/cmdline.cc
index 5b2cc4b04ca25280f21a802999eef098ce80dcb4..cf06bc1c19eb3d3966a9ebe076a8a05e06b53b3d 100644 (file)
--- a/cmdline.cc
+++ b/cmdline.cc
@@ -294,12 +294,7 @@ uint64_t parseRLimit(int res, const char* optarg, unsigned long mul) {
        return val;
 }
 
-static std::string argByColon(const char* str, size_t pos) {
-       if (!str) {
-               return "";
-       }
-       std::vector<std::string> vec;
-       util::strSplit(str, &vec, ':');
+static std::string argFromVec(const std::vector<std::string>& vec, size_t pos) {
        if (pos >= vec.size()) {
                return "";
        }
@@ -635,9 +630,10 @@ std::unique_ptr<nsjconf_t> parseArgs(int argc, char* argv[]) {
                        nsjconf->envs.push_back(optarg);
                        break;
                case 'u': {
-                       std::string i_id = argByColon(optarg, 0);
-                       std::string o_id = argByColon(optarg, 1);
-                       std::string cnt = argByColon(optarg, 2);
+                       std::vector<std::string> subopts = util::strSplit(optarg, ':');
+                       std::string i_id = argFromVec(subopts, 0);
+                       std::string o_id = argFromVec(subopts, 1);
+                       std::string cnt = argFromVec(subopts, 2);
                        size_t count = strtoul(cnt.c_str(), nullptr, 0);
                        if (!user::parseId(nsjconf.get(), i_id, o_id, count, /* is_gid= */ false,
                                /* is_newidmap= */ false)) {
@@ -645,9 +641,10 @@ std::unique_ptr<nsjconf_t> parseArgs(int argc, char* argv[]) {
                        }
                } break;
                case 'g': {
-                       std::string i_id = argByColon(optarg, 0);
-                       std::string o_id = argByColon(optarg, 1);
-                       std::string cnt = argByColon(optarg, 2);
+                       std::vector<std::string> subopts = util::strSplit(optarg, ':');
+                       std::string i_id = argFromVec(subopts, 0);
+                       std::string o_id = argFromVec(subopts, 1);
+                       std::string cnt = argFromVec(subopts, 2);
                        size_t count = strtoul(cnt.c_str(), nullptr, 0);
                        if (!user::parseId(nsjconf.get(), i_id, o_id, count, /* is_gid= */ true,
                                /* is_newidmap= */ false)) {
@@ -655,9 +652,10 @@ std::unique_ptr<nsjconf_t> parseArgs(int argc, char* argv[]) {
                        }
                } break;
                case 'U': {
-                       std::string i_id = argByColon(optarg, 0);
-                       std::string o_id = argByColon(optarg, 1);
-                       std::string cnt = argByColon(optarg, 2);
+                       std::vector<std::string> subopts = util::strSplit(optarg, ':');
+                       std::string i_id = argFromVec(subopts, 0);
+                       std::string o_id = argFromVec(subopts, 1);
+                       std::string cnt = argFromVec(subopts, 2);
                        size_t count = strtoul(cnt.c_str(), nullptr, 0);
                        if (!user::parseId(nsjconf.get(), i_id, o_id, count, /* is_gid= */ false,
                                /* is_newidmap= */ true)) {
@@ -665,9 +663,10 @@ std::unique_ptr<nsjconf_t> parseArgs(int argc, char* argv[]) {
                        }
                } break;
                case 'G': {
-                       std::string i_id = argByColon(optarg, 0);
-                       std::string o_id = argByColon(optarg, 1);
-                       std::string cnt = argByColon(optarg, 2);
+                       std::vector<std::string> subopts = util::strSplit(optarg, ':');
+                       std::string i_id = argFromVec(subopts, 0);
+                       std::string o_id = argFromVec(subopts, 1);
+                       std::string cnt = argFromVec(subopts, 2);
                        size_t count = strtoul(cnt.c_str(), nullptr, 0);
                        if (!user::parseId(nsjconf.get(), i_id, o_id, count, /* is_gid= */ true,
                                /* is_newidmap= */ true)) {
@@ -675,8 +674,9 @@ std::unique_ptr<nsjconf_t> parseArgs(int argc, char* argv[]) {
                        }
                } break;
                case 'R': {
-                       std::string src = argByColon(optarg, 0);
-                       std::string dst = argByColon(optarg, 1);
+                       std::vector<std::string> subopts = util::strSplit(optarg, ':');
+                       std::string src = argFromVec(subopts, 0);
+                       std::string dst = argFromVec(subopts, 1);
                        if (dst.empty()) {
                                dst = src;
                        }
@@ -689,8 +689,9 @@ std::unique_ptr<nsjconf_t> parseArgs(int argc, char* argv[]) {
                        }
                }; break;
                case 'B': {
-                       std::string src = argByColon(optarg, 0);
-                       std::string dst = argByColon(optarg, 1);
+                       std::vector<std::string> subopts = util::strSplit(optarg, ':');
+                       std::string src = argFromVec(subopts, 0);
+                       std::string dst = argFromVec(subopts, 1);
                        if (dst.empty()) {
                                dst = src;
                        }
@@ -712,13 +713,14 @@ std::unique_ptr<nsjconf_t> parseArgs(int argc, char* argv[]) {
                        }
                }; break;
                case 'm': {
-                       std::string src = argByColon(optarg, 0);
-                       std::string dst = argByColon(optarg, 1);
+                       std::vector<std::string> subopts = util::strSplit(optarg, ':');
+                       std::string src = argFromVec(subopts, 0);
+                       std::string dst = argFromVec(subopts, 1);
                        if (dst.empty()) {
                                dst = src;
                        }
-                       std::string fs_type = argByColon(optarg, 2);
-                       std::string options = argByColon(optarg, 3);
+                       std::string fs_type = argFromVec(subopts, 2);
+                       std::string options = argFromVec(subopts, 3);
                        if (!mnt::addMountPtTail(nsjconf.get(), src, dst, /* fs_type= */ fs_type,
                                /* options= */ options, /* flags= */ 0,
                                /* is_dir= */ mnt::NS_DIR_MAYBE, /* is_mandatory= */ true,

diff --git a/util.cc b/util.cc
index 9975c634f02916d4e6ece433065109ef5db6daca..bbbcaf7fd954035a4188b30d6cf37784da5a1311 100644 (file)
--- a/util.cc
+++ b/util.cc
@@ -283,12 +283,13 @@ const std::string timeToStr(time_t t) {
        return timestr;
 }
 
-void strSplit(const std::string str, std::vector<std::string>* vec, char delim) {
-       std::string word;
+std::vector<std::string> strSplit(const std::string str, char delim) {
+       std::vector<std::string> vec;
        std::istringstream stream(str);
        for (std::string word; std::getline(stream, word, delim);) {
-               vec->push_back(word);
+               vec.push_back(word);
        }
+       return vec;
 }
 
 }  // namespace util

diff --git a/util.h b/util.h
index 8b9a3cdb31a84526cf6777f006b01895f7fd31d0..47ccfdffa6665d4b549e33a8d1cf26d2deb3a60c 100644 (file)
--- a/util.h
+++ b/util.h
@@ -43,7 +43,7 @@ bool isANumber(const char* s);
 uint64_t rnd64(void);
 const std::string sigName(int signo);
 const std::string timeToStr(time_t t);
-void strSplit(const std::string str, std::vector<std::string>* vec, char delim);
+std::vector<std::string> strSplit(const std::string str, char delim);
 
 }  // namespace util