Merge branch 'master' into presence-refactor

This was a large, heavily conflicted merge and things MAY have got broken.
Please check!

1 files changed, 79 insertions, 0 deletions

diff --git a/OpenSim/Tools/Configger/Util.cs b/OpenSim/Tools/Configger/Util.cs
new file mode 100644
index 0000000..6f8aa76
--- /dev/null
+++ b/OpenSim/Tools/Configger/Util.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.IO.Compression;
+using System.Net;
+using System.Net.Sockets;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using log4net;
+using Nini.Config;
+
+namespace Careminster
+{
+    public static class Util
+    {
+        public static string[] Glob(string path)
+        {
+            string vol=String.Empty;
+
+            if (Path.VolumeSeparatorChar != Path.DirectorySeparatorChar)
+            {
+                string[] vcomps = path.Split(new char[] {Path.VolumeSeparatorChar}, 2, StringSplitOptions.RemoveEmptyEntries);
+
+                if (vcomps.Length > 1)
+                {
+                    path = vcomps[1];
+                    vol = vcomps[0];
+                }
+            }
+            
+            string[] comps = path.Split(new char[] {Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar}, StringSplitOptions.RemoveEmptyEntries);
+
+            // Glob
+
+            path = vol;
+            if (vol != String.Empty)
+                path += new String(new char[] {Path.VolumeSeparatorChar, Path.DirectorySeparatorChar});
+            else
+                path = new String(new char[] {Path.DirectorySeparatorChar});
+
+            List<string> paths = new List<string>();
+            List<string> found = new List<string>();
+            paths.Add(path);
+
+            int compIndex = -1;
+            foreach (string c in comps)
+            {
+                compIndex++;
+
+                List<string> addpaths = new List<string>();
+                foreach (string p in paths)
+                {
+                    string[] dirs = Directory.GetDirectories(p, c);
+
+                    if (dirs.Length != 0)
+                    {
+                        foreach (string dir in dirs)
+                            addpaths.Add(Path.Combine(path, dir));
+                    }
+
+                    // Only add files if that is the last path component
+                    if (compIndex == comps.Length - 1)
+                    {
+                        string[] files = Directory.GetFiles(p, c);
+                        foreach (string f in files)
+                            found.Add(f);
+                    }
+                }
+                paths = addpaths;
+            }
+
+            return found.ToArray();
+        }
+    }
+}