X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tools%2Fctsimtext.cpp;h=4c632a3e9cce0ce45e5f9819abe39d0ba60ca5a5;hb=065c60e43bbd0649f42fde5351dc073f59b3aa28;hp=994fea0aa422f69f1689bafa3d3c8480019bd327;hpb=0b7751a41a5a51daa7f919e5ba492a5f629c1393;p=ctsim.git

diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp
index 994fea0..4c632a3 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.11 2001/01/13 04:44:47 kevin Exp $
+**  $Id: ctsimtext.cpp,v 1.15 2001/01/16 20:55:29 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,7 +45,7 @@ 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.11 2001/01/13 04:44:47 kevin Exp $";
+static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.15 2001/01/16 20:55:29 kevin Exp $";
 static const char* const s_szProgramName = "ctsimtext";
 static const char* const s_szProgramName2 = "ctsimtext.exe";
 
@@ -104,13 +104,9 @@ ctsimtext_main (int argc, char * argv[])
 {
   int iReturn = 0;  
   
-  if (argc > 1 && (strcmp(argv[0], fileBasename (s_szProgramName)) == 0 || strcmp(argv[0], fileBasename (s_szProgramName2)) == 0)) {
-    argv = &argv[1];
+  if (argc > 1 && (strcmp(s_szProgramName, fileBasename (argv[0])) == 0 || strcmp(s_szProgramName2, fileBasename (argv[0])) == 0)) {
+    argv++;
     argc--;
-    if (argc > 1 && (strcmp(argv[0], fileBasename (s_szProgramName)) == 0 || strcmp(argv[0], fileBasename (s_szProgramName2)) == 0)) {
-      argv = &argv[2];
-      argc--;
-    }
     iReturn = processCommand (argc, argv);
   } else if (argc > 1){
     iReturn = processCommand (argc, argv);
@@ -133,7 +129,7 @@ ctsimtext_main (int argc, char * argv[])
       char* pszInputLine = new char [s_MaxLineLength+1];
       std::cout << szPrompt;
       std::cin.getline (pszInputLine, s_MaxLineLength);
-
+      
 #ifdef DEBUG
       std::cout << "#" << pszInputLine << "#\n";
 #endif
@@ -151,7 +147,7 @@ ctsimtext_main (int argc, char * argv[])
         std::cout << "Token " << i << ": " << argv[i] << "\n";
 #endif
       iReturn = processCommand (argc, argv);
-
+      
       delete pszInputLine;
     }
   }
@@ -230,35 +226,41 @@ processCommand (int argc, char* const argv[])
 {
   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)
-    return if2_main (argc, argv);
-  else if (strcasecmp (pszFunction, "ifexport") == 0)
-    return ifexport_main (argc, argv);
-  else if (strcasecmp (pszFunction, "ifinfo") == 0)
-    return ifinfo_main (argc, argv);
-  else if (strcasecmp (pszFunction, "phm2if") == 0)
-    return phm2if_main (argc, argv);
-  else if (strcasecmp (pszFunction, "phm2pj") == 0)
-    return phm2pj_main (argc, argv);
-  else if (strcasecmp (pszFunction, "pj2if") == 0)
-    return pj2if_main (argc, argv);
-  else if (strcasecmp (pszFunction, "pjinfo") == 0)
-    return pjinfo_main (argc, argv);
-  else if (strcasecmp (pszFunction, "pjrec") == 0)
-    return pjrec_main (argc, argv);
-  else {
-    std::cout << "Unknown function name: " << pszFunction << "\n";
-    if (s_bInteractive)
-      interactive_usage();
-    else
-      ctsimtext_usage (s_szProgramName);
-    return 1;
-  }
+  try {  
+    if (strcasecmp (pszFunction, "if1") == 0)
+      return if1_main (argc, argv);
+    else if (strcasecmp (pszFunction, "if2") == 0)
+      return if2_main (argc, argv);
+    else if (strcasecmp (pszFunction, "ifexport") == 0)
+      return ifexport_main (argc, argv);
+    else if (strcasecmp (pszFunction, "ifinfo") == 0)
+      return ifinfo_main (argc, argv);
+    else if (strcasecmp (pszFunction, "phm2if") == 0)
+      return phm2if_main (argc, argv);
+    else if (strcasecmp (pszFunction, "phm2pj") == 0)
+      return phm2pj_main (argc, argv);
+    else if (strcasecmp (pszFunction, "pj2if") == 0)
+      return pj2if_main (argc, argv);
+    else if (strcasecmp (pszFunction, "pjinfo") == 0)
+      return pjinfo_main (argc, argv);
+    else if (strcasecmp (pszFunction, "pjrec") == 0)
+      return pjrec_main (argc, argv);
+    else {
+      std::cout << "Unknown function name: " << pszFunction << "\n";
+      if (s_bInteractive)
+        interactive_usage();
+      else
+        ctsimtext_usage (s_szProgramName);
+      return 1;
+    }
+  } catch (exception e) {
+    std::cerr << "Exception: " << e.what() << std::endl;
+  } catch (...) {
+std:cerr << "Unknown exception caught\n";
+  }  
 }
 
 int 
@@ -266,33 +268,8 @@ main (int argc, char* argv[])
 {
   int retval = 1;
   
-  try {
-    retval = ctsimtext_main(argc, argv);
-  } catch (exception e) {
-    std::cerr << "Exception: " << e.what() << std::endl;
-  } catch (...) {
-    std::cerr << "Unknown exception\n";
-  }
+  retval = ctsimtext_main(argc, argv);
   
-  return (retval);
+  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