More cleanup

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

diff --git a/src/main.cpp b/src/main.cpp
index a570cdd792821bfee3f38891b4a2f919c4d41f19..d9bc1f4d2f7564af50f764267909325eccfa866f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez, 2020 Armaan Bhojwani
+// gen-shell, the generic shell
+//
+// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez,
+// 2020, Armaan Bhojwani
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,47 +27,21 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+
 #include <cmake.h>
 #include <iostream>
-#include <vector>
-#include <string>
 #include <../Sarge/src/sarge.h>
 #include <stdlib.h>
 
 #ifdef HAVE_READLINE
-#include <readline/readline.h>
-#include <readline/history.h>
+  #include <readline/readline.h>
+  #include <readline/history.h>
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 
 using namespace std;
 
-static std::vector <std::string> contexts;
-std::string composeContexts (bool pretty = false);
-
-int promptClear ()
-{
-  contexts.clear ();
-  return 0;
-}
-
-int promptRemove ()
-{
-  if (contexts.size ())
-    contexts.pop_back ();
-
-  return 0;
-}
-
-int promptAdd (const std::string& context)
-{
-  contexts.push_back (context);
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 const std::string getResponse(const std::string & prompt) {
   std::string response {
     ""
@@ -105,12 +82,13 @@ int main(int argc, char** argv)
   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.setDescription("Make a shell from any executable");
-       sarge.setUsage("gen-shell <options>");
+  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", true);
+  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;
@@ -122,47 +100,50 @@ int main(int argc, char** argv)
     return 0;
        }
 
-  // define input command
+  bool space = true;
+  if (sarge.exists("no-space")) {
+    space = false;
+       }
+
+  // Define input command
   string arg_cmd;
   sarge.getFlag("command", arg_cmd);
-  arg_cmd += " ";
+  if ( space )
+    arg_cmd += " ";
 
-  // define prompt
+  // Define prompt
   string prompt = "";
   sarge.getFlag("prompt", prompt);
-
   if ( prompt == "" )
+  {
     prompt = "% ";
-  else
+  } else if ( space ) {
     prompt += " ";
+  }
 
-  // execute before-command
+  // Execute before-command
   string before_command;
   sarge.getFlag("before", before_command);
   system (before_command.c_str ());
 
-  // execute after-command
+  // Execute after-command
   string after_command;
   sarge.getFlag("after", after_command);
 
-  // Main program
+  // Do the stuffs!
   while (true) {
     // Display prompt, get input
     auto command = getResponse(prompt);
 
-    if (command != "")
+    // Dispatch command
+    if (command == "<EOF>" || "exit" || "quit" || ":q" )
+    // if (command == "<EOF>" || command == "exit" )
     {
-      // 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 ());
-      }
+      system (after_command.c_str ());
+      return 0;
+    } else {
+      string whole_command = arg_cmd + command;
+      system (whole_command.c_str ());
     }
   }
 }