Merge tag '0.66'

[PuTTY.git] / windows / winsftp.c

diff --git a/windows/winsftp.c b/windows/winsftp.c
index fa052eebffc5c5b41b201c1065c5317eafbe2c9c..0776cba94bdc19f544814d26dd7e985611fcae42 100644 (file)
--- a/windows/winsftp.c
+++ b/windows/winsftp.c
@@ -340,14 +340,14 @@ struct WildcardMatcher {
     char *srcpath;
 };
 
-/*
- * Return a pointer to the portion of str that comes after the last
- * slash (or backslash or colon, if `local' is TRUE).
- */
-static char *stripslashes(char *str, int local)
+char *stripslashes(const char *str, int local)
 {
     char *p;
 
+    /*
+     * On Windows, \ / : are all path component separators.
+     */
+
     if (local) {
         p = strchr(str, ':');
         if (p) str = p+1;
@@ -361,7 +361,7 @@ static char *stripslashes(char *str, int local)
        if (p) str = p+1;
     }
 
-    return str;
+    return (char *)str;
 }
 
 WildcardMatcher *begin_wildcard_matching(const char *name)