Changeset 1828

Timestamp:

2/12/2010 6:14:28 AM (3 years ago)

Author:

lowjoel

Message:

Path names need not be escaped any more since we parse the arguments by regex.

Location:

trunk/eraser6/ShellExt

Files:

• CtxMenu.cpp (modified) (3 diffs)
• CtxMenu.h (modified) (1 diff)

trunk/eraser6/ShellExt/CtxMenu.cpp

@@ -524 +524 @@
                         DWORD attributes = GetFileAttributes(item.c_str());
 
-                        //Escape the string
-                        std::wstring escapedItem(EscapeString(item));
-
                         //Add the correct command line for the file type.
                         if (attributes & FILE_ATTRIBUTE_DIRECTORY)
-                            commandLine += L"\"dir=" + escapedItem + L"\" ";
+                            commandLine += L"\"dir=" + item + L"\" ";
                         else
-                            commandLine += L"\"file=" + escapedItem + L"\" ";
+                            commandLine += L"\"file=" + item + L"\" ";
                     }
                 }
@@ -550 +547 @@
                     i != SelectedFiles.end(); ++i)
                 {
-                    std::wstring escapedItem(EscapeString(*i));
-                    commandLine += L"\"unused=" + escapedItem + L",clusterTips\" ";
+                    commandLine += L"\"unused=" + *i + L",clusterTips\" ";
                 }
                 
@@ -724 +720 @@
 
         return std::wstring(stringTable + 1, *stringTable);
-    }
-
-    std::wstring CCtxMenu::EscapeString(const std::wstring& string)
-    {
-        //Escape the command line (= and , are special characters)
-        std::wstring escapedItem;
-        escapedItem.reserve(string.length());
-        for (std::wstring::const_iterator i = string.begin(); i != string.end(); ++i)
-        {
-            if (wcschr(L"\\=,", *i))
-                escapedItem += '\\';
-            escapedItem += *i;
-        }
-
-        return escapedItem;
     }
 

trunk/eraser6/ShellExt/CtxMenu.h

@@ -81 +81 @@
 
         static std::wstring LoadString(UINT stringID);
-        static std::wstring EscapeString(const std::wstring& string);
         static std::wstring FormatString(const std::wstring& formatString, ...);
         static std::wstring FormatError(DWORD lastError = static_cast<DWORD>(-1));