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

diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp
index 4c632a3..75f941f 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.15 2001/01/16 20:55:29 kevin Exp $
+**  $Id: ctsimtext.cpp,v 1.19 2001/04/02 22:50:25 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,9 +45,10 @@ 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.15 2001/01/16 20:55:29 kevin Exp $";
+static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.19 2001/04/02 22:50:25 kevin Exp $";
 static const char* const s_szProgramName = "ctsimtext";
 static const char* const s_szProgramName2 = "ctsimtext.exe";
+static const char* const s_szProgramName3 = "ctsimtext-lam";
 
 extern int if1_main (int argc, char* const argv[]);
 extern int if2_main (int argc, char* const argv[]);
@@ -67,7 +68,11 @@ void
 ctsimtext_usage (const char *program)
 {
   std::cout << "usage: " << fileBasename(program) << " ctsim-function-name ctstim-function-parameters...\n";
-  std::cout << "CTSim text shell\n\n";
+  std::cout << "CTSim text shell";
+#ifdef VERSION
+  std::cout << ", Version " <<VERSION;
+#endif
+  std::cout << "\n\n";
   std::cout << "  if1           Single image file conversion\n";
   std::cout << "  if2           Dual image file conversions\n";
   std::cout << "  ifexport      Export an imagefile to a graphics file\n";
@@ -104,16 +109,20 @@ ctsimtext_main (int argc, char * argv[])
 {
   int iReturn = 0;  
   
-  if (argc > 1 && (strcmp(s_szProgramName, fileBasename (argv[0])) == 0 || strcmp(s_szProgramName2, fileBasename (argv[0])) == 0)) {
+  if (argc > 1 && (strcmp(s_szProgramName, fileBasename (argv[0])) == 0 || strcmp(s_szProgramName2, fileBasename (argv[0])) == 0 || strcmp(s_szProgramName3, fileBasename (argv[0])) == 0)) {
     argv++;
     argc--;
     iReturn = processCommand (argc, argv);
-  } else if (argc > 1){
+  } else if (argc >= 1 && ! (strcmp(s_szProgramName, fileBasename (argv[0])) == 0 || strcmp(s_szProgramName2, fileBasename (argv[0])) == 0 || strcmp(s_szProgramName3, fileBasename (argv[0])) == 0)) {
     iReturn = processCommand (argc, argv);
   } else {
     s_bInteractive = true;
     char szPrompt[] = "CTSim> ";
-    std::cout << "CTSim Text Shell (Type \"quit\" to end)\n\n";
+    std::cout << "CTSim Text Shell";
+#ifdef VERSION
+    std::cout << ", Version " << VERSION;
+#endif
+    std::cout << " (Type \"quit\" to end)\n\n";
     
     while (1) {
 #ifdef HAVE_READLINE
@@ -152,7 +161,6 @@ ctsimtext_main (int argc, char * argv[])
     }
   }
   
-  
   return iReturn;
 }
 
@@ -259,8 +267,10 @@ processCommand (int argc, char* const argv[])
   } catch (exception e) {
     std::cerr << "Exception: " << e.what() << std::endl;
   } catch (...) {
-std:cerr << "Unknown exception caught\n";
+    std::cerr << "Unknown exception caught\n";
   }  
+
+  return 1;
 }
 
 int