X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tools%2Fctsimtext.cpp;h=a6f6966b309bbce75e3fc4ee731c6986e0f97cdc;hb=1be55ea0c82499e7e007fc0c1c3184af97db3a71;hp=7d881bbc1b86b8a38ed7e2c730f35932ac004471;hpb=24b07bf3f7c9f16caca7c3e3a3b4c080754529b4;p=ctsim.git

diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp
index 7d881bb..a6f6966 100644
--- a/tools/ctsimtext.cpp
+++ b/tools/ctsimtext.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsimtext.cpp,v 1.6 2001/01/10 18:32:40 kevin Exp $
+**  $Id: ctsimtext.cpp,v 1.12 2001/01/13 05:02:20 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -45,8 +45,9 @@ extern "C" {
 // If linked to ctsimtext, but executed as another name, eg pjrec, then program will use that
 // linked name as name of function.
 
-static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.6 2001/01/10 18:32:40 kevin Exp $";
+static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.12 2001/01/13 05:02:20 kevin Exp $";
 static const char* const s_szProgramName = "ctsimtext";
+static const char* const s_szProgramName2 = "ctsimtext.exe";
 
 extern int if1_main (int argc, char* const argv[]);
 extern int if2_main (int argc, char* const argv[]);
@@ -98,15 +99,15 @@ interactive_usage ()
 
 static bool s_bInteractive = false;
 
-
 int 
 ctsimtext_main (int argc, char * argv[])
 {
-  int iReturn = 0;
-
-  if (argc > 1 && strcmp(argv[0], fileBasename (s_szProgramName)) == 0) {
-    argv = &argv[1];
+  int iReturn = 0;  
+  
+  if (argc > 1 && (strcmp(argv[0], fileBasename (s_szProgramName)) == 0 || strcmp(argv[0], fileBasename (s_szProgramName2)) == 0)) {
+    argv++;
     argc--;
+    }
     iReturn = processCommand (argc, argv);
   } else if (argc > 1){
     iReturn = processCommand (argc, argv);
@@ -114,43 +115,45 @@ ctsimtext_main (int argc, char * argv[])
     s_bInteractive = true;
     char szPrompt[] = "CTSim> ";
     std::cout << "CTSim Text Shell (Type \"quit\" to end)\n\n";
+    
     while (1) {
 #ifdef HAVE_READLINE
-      char* pszInput = readline (szPrompt);
-      if (! pszInput)
-	break;
-      if (*pszInput != EOS)
-	add_history (pszInput);
-#else
+      char* pszInputLine = readline (szPrompt);
+      if (! pszInputLine)
+        break;
+      if (*pszInputLine != EOS)
+        add_history (pszInputLine);
+      
+#else  // DONT_HAVE_READLINE
+      
+      static const int s_MaxLineLength = 1024;
+      char* pszInputLine = new char [s_MaxLineLength+1];
       std::cout << szPrompt;
-      std::string strInput;
-#ifdef MSVC
-      std::getline (std::cin, strInput);
-#else
-      std::cin >> strInput;
-#endif
+      std::cin.getline (pszInputLine, s_MaxLineLength);
+
 #ifdef DEBUG
-      std::cout << "#" << strInput << "#\n";
+      std::cout << "#" << pszInputLine << "#\n";
 #endif
+      
       std::cout << std::flush;
       std::cout << "\n";
-      char* pszInput = new char [strlen(strInput.c_str()) + 1];
-      strcpy (pszInput, strInput.c_str());
-#endif
-      if (strncasecmp (pszInput, "quit", 4) == 0) {
-        delete pszInput;
+#endif  // DONT_HAVE_READLINE
+      
+      if (strncasecmp (pszInputLine, "quit", 4) == 0) 
         break;
-      }
-      convertStringToArgcv (pszInput, &argc, &argv);
+      
+      convertStringToArgcv (pszInputLine, &argc, &argv);
 #ifdef DEBUG
-        for (unsigned int i = 0; i < argc; i++)
-          std::cout << "Token " << i << ": " << argv[i] << "\n";
+      for (unsigned int i = 0; i < argc; i++)
+        std::cout << "Token " << i << ": " << argv[i] << "\n";
 #endif
       iReturn = processCommand (argc, argv);
-      delete pszInput;
+
+      delete pszInputLine;
     }
   }
-
+  
+  
   return iReturn;
 }
 
@@ -160,12 +163,12 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv)
   char* pCurrentPos = pszLine;
   int nTokens = 0;
   std::vector<char*> vecpszToken;
-
+  
   // Process line
   bool bInDoubleQuote = false;
   bool bInSingleQuote = false;
   bool bInToken = false;
-
+  
   while (*pCurrentPos) {
     if (isspace (*pCurrentPos)) {
       if (! bInToken)
@@ -180,7 +183,7 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv)
     else if (*pCurrentPos == '\"') {
       if (bInSingleQuote) {
         bInSingleQuote = false;
-	*pCurrentPos = 0;
+        *pCurrentPos = 0;
       } else {
         bInSingleQuote = true;
         if (! bInToken) {
@@ -192,7 +195,7 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv)
     } else if (*pCurrentPos == '\'') {
       if (bInDoubleQuote) {
         bInDoubleQuote = false;
-	*pCurrentPos = 0;
+        *pCurrentPos = 0;
       } else {
         bInDoubleQuote = true;
         if (! bInToken) {
@@ -206,21 +209,27 @@ convertStringToArgcv (char* pszLine, int* piArgc, char*** pppArgv)
       nTokens++;
       vecpszToken.push_back (pCurrentPos);
     }
-
+    
     pCurrentPos++;
   }
-
+  
   *piArgc = nTokens;
-  *pppArgv = new char* [nTokens];
-  for (unsigned int iToken = 0; iToken < vecpszToken.size(); iToken++)
-    (*pppArgv)[iToken] = vecpszToken[iToken];
+  if (nTokens > 0) {
+    *pppArgv = new char* [nTokens];
+    for (unsigned int iToken = 0; iToken < vecpszToken.size(); iToken++)
+      (*pppArgv)[iToken] = vecpszToken[iToken];
+  } else
+    *pppArgv = NULL;
 }
 
 static int 
 processCommand (int argc, char* const argv[])
 {
-  const char* const pszFunction = fileBasename (argv[0]);
+  if (argc < 1)
+    return 1;
 
+  const char* const pszFunction = fileBasename (argv[0]);
+  
   if (strcasecmp (pszFunction, "if1") == 0)
     return if1_main (argc, argv);
   else if (strcasecmp (pszFunction, "if2") == 0)
@@ -253,15 +262,34 @@ int
 main (int argc, char* argv[])
 {
   int retval = 1;
-
+  
   try {
     retval = ctsimtext_main(argc, argv);
   } catch (exception e) {
-	  std::cerr << "Exception: " << e.what() << std::endl;
+    std::cerr << "Exception: " << e.what() << std::endl;
   } catch (...) {
-	  std::cerr << "Unknown exception\n";
+    std::cerr << "Unknown exception\n";
   }
-
+  
   return (retval);
 }
 
+
+// Hack to fix linking problems when not linking with wxWindows and CTSim GUI routines
+#ifdef MSVC
+unsigned long
+wxDialog::OnCtlColor(unsigned long a,unsigned long b,unsigned int c,unsigned int d,unsigned int e,long f)
+{return 0;}
+#endif
+
+#if 0
+#include "../src/dlgezplot.h"
+
+EZPlotDialog::EZPlotDialog (wxWindow* parent)
+  : wxDialog(), m_pEZPlotCtrl(NULL)
+{}
+
+EZPlotDialog::~EZPlotDialog()
+{}
+
+#endif