X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=src%2Fmain.cpp;h=516f22396109081ec12a451262bf87c3d5d99e01;hb=f5ab06bf079103425674d2583b149ded02e53d13;hp=a7e95fe751bff9337248f4a3762fde2933c175f0;hpb=d8afd601de1f0d8afe6eff61d40ff52d21d90fd8;p=gen-shell.git

diff --git a/src/main.cpp b/src/main.cpp
index a7e95fe..516f223 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,33 +1,11 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// 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
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
+// gen-shell - the generic shell
+// Copyright (c) 2021, Armaan Bhojwani <me@armaanb.net>
 
 #include <cmake.h>
 #include <iostream>
-#include <Sarge/src/sarge.h>
-#include <stdlib.h>
+#include <../Sarge/src/sarge.h>
+#include <vector>
+#include <string>
 
 #ifdef HAVE_READLINE
 #include <readline/readline.h>
@@ -37,35 +15,34 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 using namespace std;
-std::string promptCompose();
 
 const std::string getResponse(const std::string & prompt) {
   std::string response {
     ""
   };
 
-  // Display prompt, get input.
-  #ifdef HAVE_READLINE
+  // 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.
+    // 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::cout << "\n";
     response = "<EOF>";
   }
-  #endif
+#endif
 
   return response;
 }
@@ -78,45 +55,69 @@ int main(int argc, char** argv)
   // Command line arguments
   Sarge sarge;
 
-	sarge.setArgument("h", "help", "Get help.", false);
-	sarge.setArgument("c", "cmd", "Command to execute before entering the shell", true);
-	sarge.setDescription("Make a shell from any command");
-	sarge.setUsage("gen-shell <options> <command>");
-
-	if (!sarge.parseArguments(argc, argv)) {
-		std::cerr << "Couldn't parse arguments..." << std::endl;
-		return 1;
-	}
+  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", 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;
+    return 1;
+  }
 
-	if (sarge.exists("help")) {
-		sarge.printHelp();
+  if (sarge.exists("help")) {
+    sarge.printHelp();
     return 0;
-	}
+  }
 
+  bool space = true;
+  if (sarge.exists("no-space")) {
+    space = false;
+  }
+
+  // Define input command
   string arg_cmd;
-  sarge.getFlag("cmd", arg_cmd);
-  arg_cmd += " ";
+  sarge.getFlag("command", arg_cmd);
+  if ( space )
+    arg_cmd += " ";
+
+  // Define prompt
+  string prompt = "";
+  sarge.getFlag("prompt", prompt);
+  if ( prompt == "" )
+  {
+    prompt = "% ";
+  } else if ( space ) {
+    prompt += " ";
+  }
 
-  // Main program
-  while (true) {
-    // Compose the prompt.
-    auto prompt = promptCompose();
+  // 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);
 
-    // Display prompt, get input.
+  // Do the stuffs!
+  while (true) {
     auto command = getResponse(prompt);
 
-    if (command != "")
+    if (command == "<EOF>" || command == "exit" || command == "quit" )
     {
-      // Dispatch command.
-      if (command == "<EOF>")
-      {
-        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 ());
     }
   }
 }