Changeset 1761 for trunk/MagicSoft/Mars

Timestamp:

02/18/03 20:26:02 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
 
                                                          -*-*- END -*-*-
+ 2003/02/18: Thomas Bretz
+ 
+    * mfileio/MReadTree.cc:
+      - added a fix for a bug in the workaround using wildcards
+
+
+
  2003/02/14: Thomas Bretz
  

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -202 +202 @@
     //  (Code taken from TFile::TFile
     //
-    const char *name;
-
-    TString newname;
-
-    if ((name = gSystem->ExpandPathName(fname)))
-    {
-        newname = name;
-        delete [] name;
-    }
-
-    if (newname.IsNull())
-    {
-        *fLog << err << dbginf << "Error expanding path " << fname << "." << endl;
-        return 0;
-    }
-
-    if (gSystem->AccessPathName(newname, kFileExists))
-    {
-        *fLog << err << "ERROR - File '" << fname << "' does not exist." << endl;
-        return 0;
-    }
-
-    fname = newname.Data();
+    if (strrchr(fname, '?') || strrchr(fname, '*'))
+        *fLog << warn << "WARNING: You may encounter crashes closing the files..." << endl;
+    else
+    {
+        const char *name;
+
+        TString newname;
+
+        if ((name = gSystem->ExpandPathName(fname)))
+        {
+            newname = name;
+            delete [] name;
+        }
+
+        if (newname.IsNull())
+        {
+            *fLog << err << dbginf << "Error expanding path " << fname << "." << endl;
+            return 0;
+        }
+
+        if (gSystem->AccessPathName(newname, kFileExists))
+        {
+            *fLog << err << "ERROR - File '" << fname << "' does not exist." << endl;
+            return 0;
+        }
+
+        fname = newname.Data();
+    }
 #endif