removing spaces between arguments

daniithethomp · daniithethomp · commit a4faf9e80254 · 2025-05-24T00:52:24.000+01:00
diff --git a/src/echo_command.cpp b/src/echo_command.cpp
@@ -1,7 +1,9 @@
 #include "echo_command.h"
 #include <iostream>
 
+
 void EchoCommand::execute(const std::string& args) {
+    
     std::cout << args << std::endl;
 }
 
diff --git a/src/shell.cpp b/src/shell.cpp
@@ -2,6 +2,7 @@
 #include <iostream>
 #include <sstream>
 #include <unistd.h>
+#include <vector>
 
 void Shell::run() {
     // Flush after every std::cout / std:cerr
@@ -22,12 +23,22 @@ void Shell::run() {
         // trim leading whitespace
         size_t start = args.find_first_not_of(" ");
         if (args.find_first_of("'") != std::string::npos && args.find_first_of("'") < args.find_last_of("'")) {
-            args = args.substr(args.find_first_of("'"), args.find_last_of("'")-1);
-        }
-        if (start != std::string::npos) {
-            args = args.substr(start);
+            args = args.substr(args.find_first_of("'") + 1, args.find_last_of("'")-2);
         } else {
+            std::istringstream argsStream(args);
+            std::vector<std::string> argList;
+            std::string arg;
+            while (argsStream >> arg) {
+                argList.push_back(arg);
+            }
+
             args.clear();
+            for(size_t i = 0; i < argList.size(); ++i) {
+                args += argList[i];
+                if (i < argList.size()) {
+                    args += " ";
+                }
+            }
         }
         
         if(auto* command = commandFactory.get(cmd)) {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`#include "echo_command.h"`
`2`	`2`	`#include <iostream>`
`3`	`3`
	`4`	`+`
`4`	`5`	`void EchoCommand::execute(const std::string& args) {`
	`6`	`+`
`5`	`7`	`std::cout << args << std::endl;`
`6`	`8`	`}`
`7`	`9`