fixed multi-line cmd issue

[gen-shell.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 8c7683315cf41af527a7e36505a70ffbc8e9380f..b334ce793f1c1a02a50077a2c3b05159f73a9b73 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -38,118 +38,79 @@
 #include <readline/history.h>
 #endif
 
-std::string promptCompose ();
+using namespace std;
+std::string promptCompose();
 
-const std::string getResponse (const std::string& prompt)
-{
-  std::string response {""};
+const std::string getResponse(const std::string & prompt) {
+  std::string response {
+    ""
+  };
 
   // Display prompt, get input.
-#ifdef HAVE_READLINE
-  char *line_read = readline (prompt.c_str ());
-  if (! line_read)
-  {
+  #ifdef HAVE_READLINE
+  char * line_read = readline(prompt.c_str());
+  if (!line_read) {
     std::cout << "\n";
     response = "<EOF>";
-  }
-  else
-  {
+  } else {
     // Save history.
-    if (*line_read)
-      add_history (line_read);
+    if ( * line_read)
+      add_history(line_read);
 
-    response = std::string (line_read);
-    free (line_read);
+    response = std::string(line_read);
+    free(line_read);
   }
-#else
+  #else
   std::cout << prompt;
-  std::getline (std::cin, response);
-  if (std::cin.eof () == 1)
-  {
+  std::getline(std::cin, response);
+  if (std::cin.eof() == 1) {
     std::cout << "\n";
     response = "<EOF>";
   }
-#endif
+  #endif
 
   return response;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-static int commandLoop (bool autoClear)
-{
-  // Compose the prompt.
-  auto prompt = promptCompose ();
-
-  // Display prompt, get input.
-  auto command = getResponse (prompt);
-
-  // Obey Taskwarrior's rc.tasksh.autoclear.
-  if (autoClear)
-    std::cout << "\033[2J\033[0;0H";
-
-  int status = 0;
-  if (! isatty (fileno (stdin)) && command == "")
-  {
-    status = -1;
-  }
-  else if (command != "")
-  {
-    // Dispatch command.
-    if (command == "<EOF>")                      status = -1;
-    else if (command != "")
-    {
-      command = command;
-      std::cout << "[" << command << "]\n";
-      system (command.c_str ());
-    }
-  }
-
-  return status;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int argc, const char** argv)
+int main(int argc, char** argv)
 {
   int status = 0;
 
-  // Lightweight version checking that doesn't require initialization or any I/O.
-  if (argc == 2 && !strcmp (argv[1], "--version"))
-  {
-    std::cout << VERSION << "\n";
+  string root_cmd;
+  for (int i = 1; i < argc; ++i) {
+    root_cmd +=argv[i];
+    root_cmd += " ";
   }
-  else
-  {
-    try
-    {
-      bool autoClear = false;
-      std::string input;
-      std::string output;
-      autoClear = (output == "true\n" ||
-                   output == "1\n"    ||
-                   output == "y\n"    ||
-                   output == "yes\n"  ||
-                   output == "on\n");
 
-      while ((status = commandLoop (autoClear)) == 0)
-        ;
-    }
+  while (status == 0) {
+    // Compose the prompt.
+    auto prompt = promptCompose();
 
-    catch (const std::string& error)
-    {
-      std::cerr << error << "\n";
-      status = -1;
-    }
+    // Display prompt, get input.
+    auto command = getResponse(prompt);
 
-    catch (...)
+    int status = 0;
+    if (command != "")
     {
-      std::cerr << "Unknown error." << "\n";
-      status = -2;
+      // Dispatch command.
+      if (command == "<EOF>")                      status = 1;
+      else if (command != "")
+      {
+        if (argc == 0) {
+          string whole_command=command;
+          std::cout << "[" << command << "]\n";
+          system (command.c_str ());
+          }
+        else {
+          string whole_command = root_cmd + " " + command;
+          // std::cout << "[" << whole_command << "]\n";
+          system (whole_command.c_str ());
+        }
+      }
     }
+    if (status == 1)
+      return 0;
   }
-
-  // Returning -1 drops out of the command loop, but gets translated to 0 here,
-  // so that there is a clean way to exit.
-  return status == -1 ? 0 : status;
 }
 
 ////////////////////////////////////////////////////////////////////////////////