Changeset 4756 for trunk/MagicSoft/Mars/showlog.cc

Timestamp:

08/27/04 14:45:08 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/showlog.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/showlog.cc

@@ -2 +2 @@
 #include <fstream>
 
+#include "MArgs.h"
+
 #include "MLog.h"
+#include "MLogManip.h"
 
 using namespace std;
@@ -10 +13 @@
     gLog << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << "   showlog filename" << endl;
+    gLog << "   showlog [options] filename" << endl;
     gLog << " or" << endl;
-    gLog << "   showlog < filename" << endl << endl;
-    gLog << " This program converts colored output made with ansi codes" << endl;
-    gLog << " (like it is done by MLog) and redirected into a file back" << endl;
+    gLog << "   showlog [options] < filename" << endl << endl;
+    gLog << "   -?, -h, --help            This help" << endl << endl;
+    gLog << endl;
+    gLog << " This program converts colored output  made with ansi codes" << endl;
+    gLog << " (like it is done by MLog)  and redirected into a file back" << endl;
     gLog << " into colored output." << endl << endl;
+    gLog << " It cannot be used to get rid of the Ansi codes. To display" << endl;
+    gLog << " colored output with less use the option -R, eg." << endl;
+    gLog << "   less -R logfile.log" << endl << endl;
 }
 
@@ -22 +30 @@
 int main(int argc, char **argv)
 {
-    if (argc>2)
+    MArgs arg(argc, argv);
+
+    if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help"))
+    {
+        Usage();
+        return -1;
+    }
+
+    if (arg.GetNumOptions()>0)
+    {
+        gLog << warn << "WARNING - Unknown commandline options..." << endl;
+        arg.Print("options");
+        gLog << endl;
+    }
+
+    //
+    // check for the right usage of the program
+    //
+    if (arg.GetNumArguments()>1)
     {
         Usage();
@@ -29 +55 @@
 
     // casts necessary for gcc 2.95.3
-    istream *in = argc==2 ? (istream*)new ifstream(argv[1]) : (istream*)&cin;
+    istream *in = arg.GetNumArguments()==1 ? (istream*)new ifstream(arg.GetArgumentStr(0)) : (istream*)&cin;
     if (!*in)
     {
-        gLog << "Cannot open file " << argv[1] << ": " << strerror(errno) << endl;
+        gLog << "Cannot open file " << arg.GetArgumentStr(0) << ": " << strerror(errno) << endl;
         return -1;
     }