Changeset 1851

Timestamp:

2/18/2010 11:38:06 PM (3 years ago)

Author:

lowjoel

Message:

Fixed command line parsing when commas and equality signs are in the filename.

File:

• branches/eraser6/6.0/Eraser/Program.cs (modified) (3 diffs)

branches/eraser6/6.0/Eraser/Program.cs

@@ -774 +774 @@
                     //Check that the first parameter is not a \ otherwise this comma
                     //is escaped
-                    if (commaPos == 0 ||                                    //No possibility of escaping
-                        (commaPos >= 1 && param[commaPos - 1] != '\\') ||   //Second character
-                        (commaPos >= 2 && param[commaPos - 2] == '\\'))     //Cannot be a \\ which is an escape
+                    if (commaPos == 0 || (commaPos > 0 && CountEscapes(param, commaPos) % 2 == 0))
                     {
                         //Extract the current subparameter, and dissect the subparameter
@@ -791 +789 @@
                                     UnescapeCommandLine(subParam), null));
                             }
-                            else if (equalPos == 0 ||                               //No possibility of escaping
-                                (equalPos >= 1 && subParam[equalPos - 1] != '\\') ||//Second character
-                                (equalPos >= 2 && subParam[equalPos - 2] == '\\'))  //Double \\ which is an escape
+                            else if (equalPos == 0 ||
+                                (equalPos > 0 && CountEscapes(param, equalPos) % 2 == 0))
                             {
                                 result.Add(new KeyValuePair<string, string>(
@@ -812 +809 @@
 
                 return result;
+            }
+
+            /// <summary>
+            /// Gets the number of escapes the current token has.
+            /// </summary>
+            /// <param name="param">The parameter.</param>
+            /// <param name="index">The index of the character escaped.</param>
+            /// <returns>The number of escapes. Multiples of two indicate backslashes, odd
+            /// numbers indicate the current character is escaped.</returns>
+            private static int CountEscapes(string param, int index)
+            {
+                if (index == 0)
+                    return 0;
+
+                for (int i = 0; index != 0; ++i)
+                    if (param[--index] != '\\')
+                        return i;
+
+                return 0;
             }