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

Timestamp:

08/30/04 11:45:51 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/showlog.cc

@@ -1 +1 @@
 #include <errno.h>
 #include <fstream>
+
+#include <TRegexp.h>
 
 #include "MArgs.h"
@@ -16 +18 @@
     gLog << " or" << endl;
     gLog << "   showlog [options] < filename" << endl << endl;
+    gLog.Usage();
     gLog << "   -?, -h, --help            This help" << endl << endl;
     gLog << endl;
@@ -24 +27 @@
     gLog << " colored output with less use the option -R, eg." << endl;
     gLog << "   less -R logfile.log" << endl << endl;
+}
+
+void RemoveAnsi(TString &s)
+{
+    static const TRegexp regexp("[][[][0-9]+[m]");
+
+    int i=0;
+
+    while (1)
+    {
+        Ssiz_t len = 0;
+        Ssiz_t idx = s.Index(regexp, &len);
+        if (idx<0)
+            break;
+
+        s.Remove(idx, len);
+    }
 }
 
@@ -37 +57 @@
         return -1;
     }
+
+    const Bool_t kNoColors = arg.HasOnly("--no-colors") || arg.HasOnly("-a");
+
+    gLog.Setup(arg);
 
     if (arg.GetNumOptions()>0)
@@ -69 +93 @@
             break;
 
-        s.ReplaceAll("", "\033");
+        if (kNoColors)
+            RemoveAnsi(s);
+        else
+            s.ReplaceAll("", "\033");
         gLog << s << endl;
     }