72 lines
2.2 KiB
Diff
72 lines
2.2 KiB
Diff
From 91b53efa4b6854dc3688f55bfb329b0cafcf5325 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
|
Date: Tue, 25 Apr 2023 13:06:01 +0200
|
|
Subject: [PATCH] curl_path: bring back support for SFTP path ending in /~
|
|
|
|
libcurl used to do a directory listing for this case (even though the
|
|
documentation says a URL needs to end in a slash for this), but
|
|
4e2b52b5f7a3 modified the behavior.
|
|
|
|
This change brings back a directory listing for SFTP paths that are
|
|
specified exactly as /~ in the URL.
|
|
|
|
Reported-by: Pavel Mayorov
|
|
Fixes #11001
|
|
Closes #11023
|
|
|
|
Conflict: NA
|
|
Reference: https://github.com/curl/curl/commit/91b53efa4b6854dc3688f55bfb329b0cafcf5325
|
|
---
|
|
lib/curl_path.c | 31 +++++++++++++++++--------------
|
|
1 file changed, 17 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/lib/curl_path.c b/lib/curl_path.c
|
|
index 977e5336f..b4b48fe86 100644
|
|
--- a/lib/curl_path.c
|
|
+++ b/lib/curl_path.c
|
|
@@ -62,24 +62,27 @@ CURLcode Curl_getworkingpath(struct Curl_easy *data,
|
|
}
|
|
}
|
|
else if((data->conn->handler->protocol & CURLPROTO_SFTP) &&
|
|
- (working_path_len > 2) && !memcmp(working_path, "/~/", 3)) {
|
|
- size_t len;
|
|
- const char *p;
|
|
- int copyfrom = 3;
|
|
+ (!strcmp("/~", working_path) ||
|
|
+ ((working_path_len > 2) && !memcmp(working_path, "/~/", 3)))) {
|
|
if(Curl_dyn_add(&npath, homedir)) {
|
|
free(working_path);
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
- /* Copy a separating '/' if homedir does not end with one */
|
|
- len = Curl_dyn_len(&npath);
|
|
- p = Curl_dyn_ptr(&npath);
|
|
- if(len && (p[len-1] != '/'))
|
|
- copyfrom = 2;
|
|
-
|
|
- if(Curl_dyn_addn(&npath,
|
|
- &working_path[copyfrom], working_path_len - copyfrom)) {
|
|
- free(working_path);
|
|
- return CURLE_OUT_OF_MEMORY;
|
|
+ if(working_path_len > 2) {
|
|
+ size_t len;
|
|
+ const char *p;
|
|
+ int copyfrom = 3;
|
|
+ /* Copy a separating '/' if homedir does not end with one */
|
|
+ len = Curl_dyn_len(&npath);
|
|
+ p = Curl_dyn_ptr(&npath);
|
|
+ if(len && (p[len-1] != '/'))
|
|
+ copyfrom = 2;
|
|
+
|
|
+ if(Curl_dyn_addn(&npath,
|
|
+ &working_path[copyfrom], working_path_len - copyfrom)) {
|
|
+ free(working_path);
|
|
+ return CURLE_OUT_OF_MEMORY;
|
|
+ }
|
|
}
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|