Code cleanup, no-space

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

diff --git a/src/main.cpp b/src/main.cpp
index 8c7683315cf41af527a7e36505a70ffbc8e9380f..0d7a03412413b4ec790c1f64b06d8442df1d2c8d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,130 +26,125 @@
 
 #include <cmake.h>
 #include <iostream>
-#include <vector>
-#include <string>
-#include <cstring>
-#include <cstdio>
+#include <../Sarge/src/sarge.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #ifdef HAVE_READLINE
-#include <readline/readline.h>
-#include <readline/history.h>
+  #include <readline/readline.h>
+  #include <readline/history.h>
 #endif
 
-std::string promptCompose ();
+////////////////////////////////////////////////////////////////////////////////
 
-const std::string getResponse (const std::string& prompt)
-{
-  std::string response {""};
+using namespace std;
 
-  // Display prompt, get input.
-#ifdef HAVE_READLINE
-  char *line_read = readline (prompt.c_str ());
-  if (! line_read)
-  {
+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) {
     std::cout << "\n";
     response = "<EOF>";
+  } else {
+    // Save history
+    if ( * line_read)
+      add_history(line_read);
+
+    response = std::string(line_read);
+    free(line_read);
   }
-  else
-  {
-    // Save history.
-    if (*line_read)
-      add_history (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";
-  }
-  else
-  {
-    try
+  // Command line arguments
+  Sarge sarge;
+
+       sarge.setArgument("a", "after", "Command to execute before leaving the shell", true);
+  sarge.setArgument("b", "before", "Command to execute before entering the shell", true);
+  sarge.setArgument("c", "command", "Command to convert to shell", true);
+  sarge.setArgument("h", "help", "Get help.", false);
+  sarge.setArgument("p", "prompt", "Define a custom prompt", true);
+  sarge.setArgument("", "no-space", "Dont automatically add spaces after custom prompt and command", false);
+  sarge.setDescription("Make a shell from any executable");
+  sarge.setUsage("gen-shell <options>");
+
+       if (!sarge.parseArguments(argc, argv)) {
+               std::cerr << "Couldn't parse arguments..." << std::endl;
+               return 1;
+       }
+
+       if (sarge.exists("help")) {
+               sarge.printHelp();
+    return 0;
+       }
+
+  bool space;
+  if (sarge.exists("no-space")) {
+    space = false;
+       }
+
+  // Define input command
+  string arg_cmd;
+  sarge.getFlag("command", arg_cmd);
+  if ( space )
+    arg_cmd += " ";
+
+  // Define prompt
+  string prompt = "";
+  sarge.getFlag("prompt", prompt);
+
+  if ( prompt == "" )
+    prompt = "% ";
+  if ( space )
+    prompt += " ";
+
+  // Execute before-command
+  string before_command;
+  sarge.getFlag("before", before_command);
+  system (before_command.c_str ());
+
+  // Execute after-command
+  string after_command;
+  sarge.getFlag("after", after_command);
+
+  // Main program
+  while (true) {
+    // Display prompt, get input
+    auto command = getResponse(prompt);
+
+    if (command != "")
     {
-      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)
-        ;
-    }
-
-    catch (const std::string& error)
-    {
-      std::cerr << error << "\n";
-      status = -1;
-    }
-
-    catch (...)
-    {
-      std::cerr << "Unknown error." << "\n";
-      status = -2;
+      // Dispatch command
+      if (command == "<EOF>")
+      {
+        system (after_command.c_str ());
+        return 0;
+      }
+      else if (command != "")
+      {
+        string whole_command = arg_cmd + command;
+        system (whole_command.c_str ());
+      }
     }
   }
-
-  // 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;
 }
 
 ////////////////////////////////////////////////////////////////////////////////