1 files changed, 108 insertions, 108 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
index e785c6c..80641e3 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
@@ -1,108 +1,108 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.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;
+using System;
-using System.IO;
+using System.IO;
-//using System.Reflection;
+//using System.Reflection;
-//using log4net;
+//using log4net;
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.Environment.Modules.World.Archiver
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Temporary code to do the bare minimum required to read a tar archive for our purposes
+    /// Temporary code to do the bare minimum required to read a tar archive for our purposes
-    /// </summary>
+    /// </summary>
-    public class TarArchiveReader
+    public class TarArchiveReader
-    {
+    {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+        
-        protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
+        protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
-        
+        
-        /// <summary>
+        /// <summary>
-        /// Binary reader for the underlying stream
+        /// Binary reader for the underlying stream
-        /// </summary>
+        /// </summary>
-        protected BinaryReader m_br;
+        protected BinaryReader m_br;
-        
+        
-        public TarArchiveReader(string archivePath)
+        public TarArchiveReader(string archivePath)
-        {
+        {
-            m_br = new BinaryReader(new FileStream(archivePath, FileMode.Open));
+            m_br = new BinaryReader(new FileStream(archivePath, FileMode.Open));
-        }
+        }
-        
+        
-        public byte[] Read(out string filePath)
+        public byte[] Read(out string filePath)
-        {
+        {
-            TarHeader header = ReadHeader();
+            TarHeader header = ReadHeader();
-            filePath = header.FilePath;
+            filePath = header.FilePath;
-            return m_br.ReadBytes(header.FileSize);
+            return m_br.ReadBytes(header.FileSize);
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Read the next 512 byte chunk of data as a tar header.
+        /// Read the next 512 byte chunk of data as a tar header.
-        /// </summary>
+        /// </summary>
-        /// <returns>A tar header struct</returns>
+        /// <returns>A tar header struct</returns>
-        protected TarHeader ReadHeader()
+        protected TarHeader ReadHeader()
-        {
+        {
-            TarHeader tarHeader = new TarHeader();
+            TarHeader tarHeader = new TarHeader();
-            
+            
-            byte[] header = m_br.ReadBytes(512);
+            byte[] header = m_br.ReadBytes(512);
-            
+            
-            tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100);
+            tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100);
-            tarHeader.FileSize = ConvertOctalBytesToDecimal(header, 124, 11);
+            tarHeader.FileSize = ConvertOctalBytesToDecimal(header, 124, 11);
-            
+            
-            return tarHeader;
+            return tarHeader;
-        }
+        }
-        
+        
-        public void Close()
+        public void Close()
-        {
+        {
-            m_br.Close();
+            m_br.Close();
-        }
+        }
-        
+        
-        /// <summary>
+        /// <summary>
-        /// Convert octal bytes to a decimal representation
+        /// Convert octal bytes to a decimal representation
-        /// </summary>
+        /// </summary>
-        /// <param name="bytes"></param>
+        /// <param name="bytes"></param>
-        /// <returns></returns>
+        /// <returns></returns>
-        public static int ConvertOctalBytesToDecimal(byte[] bytes, int startIndex, int count)
+        public static int ConvertOctalBytesToDecimal(byte[] bytes, int startIndex, int count)
-        {           
+        {           
-            string oString = m_asciiEncoding.GetString(bytes, startIndex, count);            
+            string oString = m_asciiEncoding.GetString(bytes, startIndex, count);            
-            
+            
-            int d = 0;
+            int d = 0;
-                        
+                        
-            foreach (char c in oString)
+            foreach (char c in oString)
-            {
+            {
-                d <<= 3;                
+                d <<= 3;                
-                d |= c - '0';               
+                d |= c - '0';               
-            }
+            }
-            return d;
+            return d;
-        }        
+        }        
-    }
+    }
-    
+    
-    public struct TarHeader
+    public struct TarHeader
-    {
+    {
-        public string FilePath;
+        public string FilePath;
-        public int FileSize;
+        public int FileSize;
-    }
+    }
-}
+}

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs index e785c6c..80641e3 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
@@ -1,108 +1,108 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.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;	28	using System;
29	using System.IO;	29	using System.IO;
30	//using System.Reflection;	30	//using System.Reflection;
31	//using log4net;	31	//using log4net;
32		32
33	namespace OpenSim.Region.Environment.Modules.World.Archiver	33	namespace OpenSim.Region.Environment.Modules.World.Archiver
34	{	34	{
35	/// <summary>	35	/// <summary>
36	/// Temporary code to do the bare minimum required to read a tar archive for our purposes	36	/// Temporary code to do the bare minimum required to read a tar archive for our purposes
37	/// </summary>	37	/// </summary>
38	public class TarArchiveReader	38	public class TarArchiveReader
39	{	39	{
40	// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	40	// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41		41
42	protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();	42	protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
43		43
44	/// <summary>	44	/// <summary>
45	/// Binary reader for the underlying stream	45	/// Binary reader for the underlying stream
46	/// </summary>	46	/// </summary>
47	protected BinaryReader m_br;	47	protected BinaryReader m_br;
48		48
49	public TarArchiveReader(string archivePath)	49	public TarArchiveReader(string archivePath)
50	{	50	{
51	m_br = new BinaryReader(new FileStream(archivePath, FileMode.Open));	51	m_br = new BinaryReader(new FileStream(archivePath, FileMode.Open));
52	}	52	}
53		53
54	public byte[] Read(out string filePath)	54	public byte[] Read(out string filePath)
55	{	55	{
56	TarHeader header = ReadHeader();	56	TarHeader header = ReadHeader();
57	filePath = header.FilePath;	57	filePath = header.FilePath;
58	return m_br.ReadBytes(header.FileSize);	58	return m_br.ReadBytes(header.FileSize);
59	}	59	}
60		60
61	/// <summary>	61	/// <summary>
62	/// Read the next 512 byte chunk of data as a tar header.	62	/// Read the next 512 byte chunk of data as a tar header.
63	/// </summary>	63	/// </summary>
64	/// <returns>A tar header struct</returns>	64	/// <returns>A tar header struct</returns>
65	protected TarHeader ReadHeader()	65	protected TarHeader ReadHeader()
66	{	66	{
67	TarHeader tarHeader = new TarHeader();	67	TarHeader tarHeader = new TarHeader();
68		68
69	byte[] header = m_br.ReadBytes(512);	69	byte[] header = m_br.ReadBytes(512);
70		70
71	tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100);	71	tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100);
72	tarHeader.FileSize = ConvertOctalBytesToDecimal(header, 124, 11);	72	tarHeader.FileSize = ConvertOctalBytesToDecimal(header, 124, 11);
73		73
74	return tarHeader;	74	return tarHeader;
75	}	75	}
76		76
77	public void Close()	77	public void Close()
78	{	78	{
79	m_br.Close();	79	m_br.Close();
80	}	80	}
81		81
82	/// <summary>	82	/// <summary>
83	/// Convert octal bytes to a decimal representation	83	/// Convert octal bytes to a decimal representation
84	/// </summary>	84	/// </summary>
85	/// <param name="bytes"></param>	85	/// <param name="bytes"></param>
86	/// <returns></returns>	86	/// <returns></returns>
87	public static int ConvertOctalBytesToDecimal(byte[] bytes, int startIndex, int count)	87	public static int ConvertOctalBytesToDecimal(byte[] bytes, int startIndex, int count)
88	{	88	{
89	string oString = m_asciiEncoding.GetString(bytes, startIndex, count);	89	string oString = m_asciiEncoding.GetString(bytes, startIndex, count);
90		90
91	int d = 0;	91	int d = 0;
92		92
93	foreach (char c in oString)	93	foreach (char c in oString)
94	{	94	{
95	d <<= 3;	95	d <<= 3;
96	d \|= c - '0';	96	d \|= c - '0';
97	}	97	}
98		98
99	return d;	99	return d;
100	}	100	}
101	}	101	}
102		102
103	public struct TarHeader	103	public struct TarHeader
104	{	104	{
105	public string FilePath;	105	public string FilePath;
106	public int FileSize;	106	public int FileSize;
107	}	107	}
108	}	108	}