X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Ftests%2Fmis.cs;h=d6bb5b22a8c97f347b6048451b1e037325dbb247;hb=225f2402eb7fbb22815bdc736a1c4998ba8626d2;hp=537536935261ef95d71e05dc07ca5a79a44b49c7;hpb=2489932c9e54bf2824157b3c1de552bdfa33374c;p=mono.git

diff --git a/mono/tests/mis.cs b/mono/tests/mis.cs
old mode 100755
new mode 100644
index 53753693526..d6bb5b22a8c
--- a/mono/tests/mis.cs
+++ b/mono/tests/mis.cs
@@ -122,17 +122,27 @@ namespace T {
 			}
 
 			pos=req.LastIndexOf('.');
-			String filetype=req.Substring(pos);
-
+			String filetype;
+			if (pos != -1)
+				filetype = req.Substring(pos);
+			else
+				filetype = "";
+			
+
+
+			string mime_type = (string) mime_types [filetype];
+			if (mime_type == null)
+				mime_type = "text/plain";
+			
 			Console.WriteLine("File is " + req);
-			Console.WriteLine("Mime type is " + mime_types[filetype]);
-
+			Console.WriteLine("Mime type is " + mime_type);
+			
 			try {
 				FileStream f=new FileStream(req, FileMode.Open, FileAccess.Read);
 				byte[] fbuf=new byte[256];
 
 				ReplyHeaders(sock, 200, "OK",
-					     mime_types[filetype].ToString(),
+					     mime_type,
 					     null, f.Length);
 
 				int count;
@@ -174,17 +184,24 @@ namespace T {
 			}
 
 			pos=req.LastIndexOf('.');
-			String filetype=req.Substring(pos);
-
+			string filetype;
+			if (pos != -1)
+				filetype=req.Substring(pos);
+			else
+				filetype = "";
+
+			string mime_type = (string) mime_types [filetype];
+			if (mime_type == null)
+				mime_type = "text/plain";
 			Console.WriteLine("File is " + req);
-			Console.WriteLine("Mime type is " + mime_types[filetype]);
+			Console.WriteLine("Mime type is " + mime_type);
 
 			try {
 				FileStream f=new FileStream(req, FileMode.Open, FileAccess.Read);
 				byte[] fbuf=new byte[256];
 
 				ReplyHeaders(sock, 200, "OK",
-					     mime_types[filetype].ToString(),
+					     mime_type,
 					     null, f.Length);
 
 				f.Close();
@@ -197,13 +214,17 @@ namespace T {
 			}
 		}
 
-		public static int Main () {
+		public static int Main (string [] args) {
 			// Set up mime types
 			mime_types.Add(".html", "text/html");
 			mime_types.Add(".jpeg", "image/jpeg");
 			mime_types.Add(".png", "image/png");
 			mime_types.Add(".cs", "text/plain");
 
+			if (args.Length == 2 && args [0] == "--root"){
+				docroot = args [1];
+			}
+			
 			Socket s=NetSetup();
 
 			while(true) {
@@ -221,8 +242,6 @@ namespace T {
 
 				newsock.Close();
 			}
-
-			return(0);
 		}
 	}
 }