1 files changed, 96 insertions, 96 deletions
diff --git a/OpenSim/Framework/Data/IniConfig.cs b/OpenSim/Framework/Data/IniConfig.cs
index 2b52fd1..5dcb2fd 100644
--- a/OpenSim/Framework/Data/IniConfig.cs
+++ b/OpenSim/Framework/Data/IniConfig.cs
@@ -1,96 +1,96 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System.IO;
+using System.IO;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
-/* 
+/* 
- Taken from public code listing at by Alex Pinsker
+ Taken from public code listing at by Alex Pinsker
- http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html
+ http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html
- */
+ */
-namespace OpenSim.Framework.Data
+namespace OpenSim.Framework.Data
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Parse settings from ini-like files
+    /// Parse settings from ini-like files
-    /// </summary>
+    /// </summary>
-    public class IniFile
+    public class IniFile
-    {
+    {
-        static IniFile()
+        static IniFile()
-        {
+        {
-            _iniKeyValuePatternRegex = new Regex(
+            _iniKeyValuePatternRegex = new Regex(
-                @"((\s)*(?<Key>([^\=^\s^\n]+))[\s^\n]*
+                @"((\s)*(?<Key>([^\=^\s^\n]+))[\s^\n]*
-                # key part (surrounding whitespace stripped)
+                # key part (surrounding whitespace stripped)
-                \=
+                \=
-                (\s)*(?<Value>([^\n^\s]+(\n){0,1})))
+                (\s)*(?<Value>([^\n^\s]+(\n){0,1})))
-                # value part (surrounding whitespace stripped)
+                # value part (surrounding whitespace stripped)
-                ",
+                ",
-                RegexOptions.IgnorePatternWhitespace |
+                RegexOptions.IgnorePatternWhitespace |
-                RegexOptions.Compiled |
+                RegexOptions.Compiled |
-                RegexOptions.CultureInvariant);
+                RegexOptions.CultureInvariant);
-        }
+        }
-        static private Regex _iniKeyValuePatternRegex;
+        static private Regex _iniKeyValuePatternRegex;
-        public IniFile(string iniFileName)
+        public IniFile(string iniFileName)
-        {
+        {
-            _iniFileName = iniFileName;
+            _iniFileName = iniFileName;
-        }
+        }
-        public string ParseFileReadValue(string key)
+        public string ParseFileReadValue(string key)
-        {
+        {
-            using (StreamReader reader =
+            using (StreamReader reader =
-                  new StreamReader(_iniFileName))
+                  new StreamReader(_iniFileName))
-            {
+            {
-                do
+                do
-                {
+                {
-                    string line = reader.ReadLine();
+                    string line = reader.ReadLine();
-                    Match match =
+                    Match match =
-                        _iniKeyValuePatternRegex.Match(line);
+                        _iniKeyValuePatternRegex.Match(line);
-                    if (match.Success)
+                    if (match.Success)
-                    {
+                    {
-                        string currentKey =
+                        string currentKey =
-                                match.Groups["Key"].Value as string;
+                                match.Groups["Key"].Value as string;
-                        if (currentKey != null &&
+                        if (currentKey != null &&
-                       currentKey.Trim().CompareTo(key) == 0)
+                       currentKey.Trim().CompareTo(key) == 0)
-                        {
+                        {
-                            string value =
+                            string value =
-                              match.Groups["Value"].Value as string;
+                              match.Groups["Value"].Value as string;
-                            return value;
+                            return value;
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-                while (reader.Peek() != -1);
+                while (reader.Peek() != -1);
-            }
+            }
-            return null;
+            return null;
-        }
+        }
-        public string IniFileName
+        public string IniFileName
-        {
+        {
-            get { return _iniFileName; }
+            get { return _iniFileName; }
-        }    private string _iniFileName;
+        }    private string _iniFileName;
-    }
+    }
-}
+}

diff --git a/OpenSim/Framework/Data/IniConfig.cs b/OpenSim/Framework/Data/IniConfig.cs index 2b52fd1..5dcb2fd 100644 --- a/OpenSim/Framework/Data/IniConfig.cs +++ b/OpenSim/Framework/Data/IniConfig.cs
@@ -1,96 +1,96 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://www.openmetaverse.org/	2	* Copyright (c) Contributors, http://www.openmetaverse.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28	using System.IO;	28	using System.IO;
29	using System.Text.RegularExpressions;	29	using System.Text.RegularExpressions;
30	/*	30	/*
31	Taken from public code listing at by Alex Pinsker	31	Taken from public code listing at by Alex Pinsker
32	http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html	32	http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html
33	*/	33	*/
34		34
35	namespace OpenSim.Framework.Data	35	namespace OpenSim.Framework.Data
36	{	36	{
37	/// <summary>	37	/// <summary>
38	/// Parse settings from ini-like files	38	/// Parse settings from ini-like files
39	/// </summary>	39	/// </summary>
40	public class IniFile	40	public class IniFile
41	{	41	{
42	static IniFile()	42	static IniFile()
43	{	43	{
44	_iniKeyValuePatternRegex = new Regex(	44	_iniKeyValuePatternRegex = new Regex(
45	@"((\s)(?<Key>([^\=^\s^\n]+))[\s^\n]	45	@"((\s)(?<Key>([^\=^\s^\n]+))[\s^\n]
46	# key part (surrounding whitespace stripped)	46	# key part (surrounding whitespace stripped)
47	\=	47	\=
48	(\s)*(?<Value>([^\n^\s]+(\n){0,1})))	48	(\s)*(?<Value>([^\n^\s]+(\n){0,1})))
49	# value part (surrounding whitespace stripped)	49	# value part (surrounding whitespace stripped)
50	",	50	",
51	RegexOptions.IgnorePatternWhitespace \|	51	RegexOptions.IgnorePatternWhitespace \|
52	RegexOptions.Compiled \|	52	RegexOptions.Compiled \|
53	RegexOptions.CultureInvariant);	53	RegexOptions.CultureInvariant);
54	}	54	}
55	static private Regex _iniKeyValuePatternRegex;	55	static private Regex _iniKeyValuePatternRegex;
56		56
57	public IniFile(string iniFileName)	57	public IniFile(string iniFileName)
58	{	58	{
59	_iniFileName = iniFileName;	59	_iniFileName = iniFileName;
60	}	60	}
61		61
62	public string ParseFileReadValue(string key)	62	public string ParseFileReadValue(string key)
63	{	63	{
64	using (StreamReader reader =	64	using (StreamReader reader =
65	new StreamReader(_iniFileName))	65	new StreamReader(_iniFileName))
66	{	66	{
67	do	67	do
68	{	68	{
69	string line = reader.ReadLine();	69	string line = reader.ReadLine();
70	Match match =	70	Match match =
71	_iniKeyValuePatternRegex.Match(line);	71	_iniKeyValuePatternRegex.Match(line);
72	if (match.Success)	72	if (match.Success)
73	{	73	{
74	string currentKey =	74	string currentKey =
75	match.Groups["Key"].Value as string;	75	match.Groups["Key"].Value as string;
76	if (currentKey != null &&	76	if (currentKey != null &&
77	currentKey.Trim().CompareTo(key) == 0)	77	currentKey.Trim().CompareTo(key) == 0)
78	{	78	{
79	string value =	79	string value =
80	match.Groups["Value"].Value as string;	80	match.Groups["Value"].Value as string;
81	return value;	81	return value;
82	}	82	}
83	}	83	}
84		84
85	}	85	}
86	while (reader.Peek() != -1);	86	while (reader.Peek() != -1);
87	}	87	}
88	return null;	88	return null;
89	}	89	}
90		90
91	public string IniFileName	91	public string IniFileName
92	{	92	{
93	get { return _iniFileName; }	93	get { return _iniFileName; }
94	} private string _iniFileName;	94	} private string _iniFileName;
95	}	95	}
96	}	96	}