tree: rewrite TChain::ParseTreeFilename to fix ROOT-8452

Adds also full support for wildcards, at least for the backends supporting it,
and for generic paths on the command line, e.g. for

           $ root root://host.my.dom//my/dir/file.root?option#anchor

core/base/src/TApplication.cxx

@@ -476,8 +476,18 @@ void TApplication::GetOptions(Int_t *argc, char **argv)
          if (arg) *arg = '\0';
          char *dir = gSystem->ExpandPathName(argv[i]);
          TUrl udir(dir, kTRUE);
+         // remove options and anchor to check the path
+         TString sfx = udir.GetFileAndOptions();
+         TString fln = udir.GetFile();
+         sfx.Replace(sfx.Index(fln), fln.Length(), "");
+         TString path = udir.GetFile();
+         if (strcmp(udir.GetProtocol(), "file")) {
+            path = udir.GetUrl();
+            path.Replace(path.Index(sfx), sfx.Length(), "");
+         }
+         // 'path' is the full URL without suffices (options and/or anchor)
          if (arg) *arg = '(';
-         if (!gSystem->GetPathInfo(dir, &id, &size, &flags, &modtime)) {
+         if (!arg && !gSystem->GetPathInfo(path.Data(), &id, &size, &flags, &modtime)) {
             if ((flags & 2)) {
                // if directory set it in fWorkDir
                if (pwd == "") {
@@ -491,7 +501,7 @@ void TApplication::GetOptions(Int_t *argc, char **argv)
             } else if (size > 0) {
                // if file add to list of files to be processed
                if (!fFiles) fFiles = new TObjArray;
-               fFiles->Add(new TObjString(argv[i]));
+               fFiles->Add(new TObjString(path.Data()));
                argv[i] = null;
             } else {
                Warning("GetOptions", "file %s has size 0, skipping", dir);

tree/tree/src/TChain.cxx

@@ -2069,77 +2069,36 @@ Long64_t TChain::Merge(TFile* file, Int_t basketsize, Option_t* option)
 ///                        a fragment this will be empty.
 /// \param[out] suffix     the portion of name which was removed to form filename.
 
-void TChain::ParseTreeFilename(const char *name, TString &filename, TString &treename, TString &query, TString &suffix, Bool_t wildcards) const
+void TChain::ParseTreeFilename(const char *name, TString &filename, TString &treename, TString &query, TString &suffix,
+                               Bool_t) const
 {
    Ssiz_t pIdx;
-   Bool_t isUrl = kFALSE;
-   Bool_t isUrlDoFull = kFALSE;
    filename = name;
    treename.Clear();
    query.Clear();
    suffix.Clear();
 
-   pIdx = filename.Index("://");
-   if (pIdx != kNPOS && pIdx > 0 && filename.Index("/") > pIdx) {
-      // filename has a url format "xxx://"
-      // decide if to do full search for url query and fragment identifiers
-      isUrl = kTRUE;
-      if (wildcards) {
-         TUrl url(name);
-         if (url.IsValid()) {
-            TString proto = url.GetProtocol();
-            if (proto == "http" || proto == "https") {
-               isUrlDoFull = kTRUE;
-            }
-         }
-      } else {
-         isUrlDoFull = kTRUE;
-      }
-   }
-
-   if (isUrlDoFull) {
-      pIdx = filename.Index("?");
-      if (pIdx != kNPOS) {
-         query = filename(pIdx,filename.Length()-pIdx);
-         suffix = filename(pIdx, filename.Length()-pIdx);
-         filename.Remove(pIdx);
-      }
-      pIdx = query.Index("#");
-      if (pIdx != kNPOS) {
-         treename = query(pIdx+1,query.Length()-pIdx-1);
-         query.Remove(pIdx);
-         if (query.Length() == 1) {
-            // was only followed by the fragment
-            query.Clear();
-         }
-      }
-   }
-
-   if (treename.IsNull()) {
-      Ssiz_t dotSlashPos = kNPOS;
-      pIdx = filename.Index(".root");
-      while(pIdx != kNPOS) {
-         dotSlashPos = pIdx;
-         pIdx = filename.Index(".root",dotSlashPos+1);
-      }
-      if (dotSlashPos != kNPOS && filename[dotSlashPos+5]!='/') {
-         // We found the 'last' .root in the name and it is not followed by
-         // a '/', so the tree name is _not_ specified in the name.
-         dotSlashPos = kNPOS;
-      }
-      if (dotSlashPos != kNPOS) {
-         // Copy the tree name specification and remove it from filename
-         treename = filename(dotSlashPos+6,filename.Length()-dotSlashPos-6);
-         suffix.Prepend(filename(dotSlashPos+5, filename.Length()-dotSlashPos-5));
-         filename.Remove(dotSlashPos+5);
-      }
-      if (isUrl && !isUrlDoFull) {
-         pIdx = treename.Index("?");
-         if (pIdx != kNPOS) {
-            query = treename(pIdx,treename.Length()-pIdx);
-            treename.Remove(pIdx);
-         }
-      }
+   // General case
+   TUrl url(name, kTRUE);
+
+   // Extract query (and treename, if any)
+   query.Form("?%s", url.GetOptions());
+   treename = url.GetAnchor();
+
+   // Save suffix, if any
+   suffix = url.GetFileAndOptions();
+   TString fn = url.GetFile();
+   suffix.Replace(suffix.Index(fn), fn.Length(), "");
+   // Remove it from the file name
+   filename.Remove(filename.Index(fn) + fn.Length());
+
+   // Special case: [...]file.root/treename
+   static const char *dotr = ".root/";
+   static Ssiz_t dotrl = strlen(dotr);
+   pIdx = filename.Index(dotr);
+   if (pIdx != kNPOS) {
+      treename = filename(pIdx + dotrl, filename.Length());
+      filename.Remove(pIdx + dotrl - 1);
    }
 }