CONSOLE: eos rm two or more files at once. Fixes EOS-4147

Author: tavisit

console/commands/com_proto_rm.cc

@@ -68,7 +68,7 @@ RmHelper::ParseCommand(const char* arg)
   eos::console::RmProto* rm = mReq.mutable_rm();
   eos::common::StringTokenizer tokenizer(arg);
   bool noconfirmation = false;
-  
+
   tokenizer.GetLine();
 
   while ((option = tokenizer.GetToken(false)).length() > 0 &&
@@ -130,7 +130,8 @@ RmHelper::ParseCommand(const char* arg)
   eos::common::Path cPath(path.c_str());
 
   if (path.length()) {
-    mNeedsConfirmation = rm->recursive() && (cPath.GetSubPathSize() < 4) && !noconfirmation; 
+    mNeedsConfirmation =
+        rm->recursive() && (cPath.GetSubPathSize() < 4) && !noconfirmation;
   }
 
   return true;
@@ -146,22 +147,81 @@ int com_protorm(char* arg)
     global_retc = EINVAL;
     return EINVAL;
   }
+  eos::common::StringTokenizer tokenizer(arg);
+  tokenizer.GetLine();
 
-  RmHelper rm(gGlobalOpts);
+  std::vector<std::string> paths;
+  std::string optStr;
+  std::string currentPath;
+  bool inOptions = true;
+
+  XrdOucString token;
+  while ((token = tokenizer.GetToken(false)).length() > 0) {
+    if (inOptions && token.beginswith("-")) {
+      if (!optStr.empty()) {
+        optStr += " ";
+      }
+      optStr += token.c_str();
+    } else {
+      inOptions = false;
+
+      // Check if this is a new path
+      if (token.beginswith("/") || token.beginswith("fid:") ||
+          token.beginswith("fxid:") || token.beginswith("cid:") ||
+          token.beginswith("cxid:")) {
+        // Save previous path if exists
+        if (!currentPath.empty()) {
+          paths.push_back(std::move(currentPath));
+        }
+        currentPath = token.c_str();
+      } else {
+        // Continue current path
+        if (!currentPath.empty()) {
+          currentPath += " ";
+        }
+        currentPath += token.c_str();
+      }
+    }
+  }
+
+  if (!currentPath.empty()) {
+    paths.push_back(std::move(currentPath));
+  }
 
-  if (!rm.ParseCommand(arg)) {
+  if (paths.empty()) {
     com_rm_help();
     global_retc = EINVAL;
     return EINVAL;
   }
 
-  if (rm.NeedsConfirmation() && !rm.ConfirmOperation()) {
-    global_retc = EINTR;
-    return EINTR;
-  }
+  // Execute rm for each path
+  int retc = 0;
+  for (const auto& path : paths) {
+    std::string cmdArg = optStr;
+    if (!cmdArg.empty()) {
+      cmdArg += " ";
+    }
+    cmdArg += path;
+
+    RmHelper rm(gGlobalOpts);
+
+    if (!rm.ParseCommand(cmdArg.c_str())) {
+      com_rm_help();
+      global_retc = EINVAL;
+      return EINVAL;
+    }
 
-  global_retc = rm.Execute(true, true);
+    if (rm.NeedsConfirmation() && !rm.ConfirmOperation()) {
+      retc = EINTR;
+      continue;
+    }
+
+    if (const int rc = rm.Execute(true, true); rc != 0) {
+      retc = rc;
+    }
+  }
 
+  global_retc = retc;
   return global_retc;
 }
 

test/eos-instance-test

@@ -1899,6 +1899,45 @@ runtest "### Stat file   " unix SUCCESS "" command eos stat "$rmTestDir/regexx*p
 runtest "### Rm file     " unix SUCCESS "" command eos rm --no-globbing "$rmTestDir/regexx*p.tt\.ern"
 runtest "### Stat file   " unix ERROR "" command eos stat "$rmTestDir/regexx*p.tt\.ern"
 
+# ------------------------------------------------------------------------------
+# Test multiple file removal
+# ------------------------------------------------------------------------------
+RM_MULTI1="/eos/$EOS_TEST_INSTANCE/test/instancetest/multi 1.txt"
+RM_MULTI2="/eos/$EOS_TEST_INSTANCE/test/instancetest/multi 2.txt"
+RM_MULTI3="/eos/$EOS_TEST_INSTANCE/test/instancetest/ multi3 .txt"
+
+runtest "### CP          " unix SUCCESS "" eos cp /etc/passwd "'${RM_MULTI1}'"
+runtest "### CP          " unix SUCCESS "" eos cp /etc/passwd "'${RM_MULTI2}'"
+runtest "### CP          " unix SUCCESS "" eos cp /etc/passwd "'${RM_MULTI3}'"
+runtest "### Delay       " unix SUCCESS "" delay 7
+runtest "### Rm multi    " unix SUCCESS "" eos rm "'${RM_MULTI1}'" "'${RM_MULTI2}'" "'${RM_MULTI3}'"
+runtest "### Delay       " unix SUCCESS "" delay 7
+runtest "### Stat        " unix ERROR "" eos stat "'${RM_MULTI1}'"
+runtest "### Stat        " unix ERROR "" eos stat "'${RM_MULTI2}'"
+runtest "### Stat        " unix ERROR "" eos stat "'${RM_MULTI3}'"
+
+# ------------------------------------------------------------------------------
+# Test multiple recursive directory removal
+# ------------------------------------------------------------------------------
+RM_DIR1="/eos/$EOS_TEST_INSTANCE/test/instancetest/rmdir1"
+RM_DIR2="/eos/$EOS_TEST_INSTANCE/test/instancetest/rmdir2"
+RM_DIR3="/eos/$EOS_TEST_INSTANCE/test/instancetest/rmdir3"
+
+runtest "### Mkdir       " unix SUCCESS "" eos mkdir -p ${RM_DIR1}
+runtest "### Mkdir       " unix SUCCESS "" eos mkdir -p ${RM_DIR2}
+runtest "### Mkdir       " unix SUCCESS "" eos mkdir -p ${RM_DIR3}
+runtest "### Touch       " unix SUCCESS "" eos touch ${RM_DIR1}/file1.txt
+runtest "### Touch       " unix SUCCESS "" eos touch ${RM_DIR1}/file2.txt
+runtest "### Touch       " unix SUCCESS "" eos touch ${RM_DIR2}/file1.txt
+runtest "### Touch       " unix SUCCESS "" eos touch ${RM_DIR2}/file2.txt
+runtest "### Touch       " unix SUCCESS "" eos touch ${RM_DIR3}/file1.txt
+runtest "### Touch       " unix SUCCESS "" eos touch ${RM_DIR3}/file2.txt
+runtest "### Rm -r multi " unix SUCCESS "" eos rm -r ${RM_DIR1} ${RM_DIR2} ${RM_DIR3}
+runtest "### Delay       " unix SUCCESS "" delay 7
+runtest "### Stat        " unix ERROR "" eos stat ${RM_DIR1}
+runtest "### Stat        " unix ERROR "" eos stat ${RM_DIR2}
+runtest "### Stat        " unix ERROR "" eos stat ${RM_DIR3}
+
 # Cleanup everything
 runtest "### Cleanup     " unix SUCCESS "" eos rm -rF $rmTestDir/