diff options
author | Daniel Stenberg <daniel@haxx.se> | 2012-12-21 14:38:33 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2012-12-21 14:41:54 +0100 |
commit | c30c557e4d2089953339fc669474091bdd505651 (patch) | |
tree | 6c9b53b45ed95560e8d088d6e57316014fb85787 /lib/ssh.c | |
parent | d738adc1fbda9e2e545185f9d1b0551fd2d669e6 (diff) | |
download | curl-c30c557e4d2089953339fc669474091bdd505651.tar.gz |
SCP: relative path didn't work
When prefixing a path with /~/ it is supposed to be used relative to the
user's home directory but it didn't work. Now we cut off the entire
three byte sequenct "/~/" which seems to be how OpenSSH does it.
Bug: http://curl.haxx.se/bug/view.cgi?id=1173
Reported by: Balaji Parasuram
Diffstat (limited to 'lib/ssh.c')
-rw-r--r-- | lib/ssh.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -422,9 +422,9 @@ static CURLcode ssh_getworkingpath(struct connectdata *conn, free(working_path); return CURLE_OUT_OF_MEMORY; } - if((working_path_len > 1) && (working_path[1] == '~')) - /* It is referenced to the home directory, so strip the leading '/' */ - memcpy(real_path, working_path+1, 1 + working_path_len-1); + if((working_path_len > 3) && (!memcmp(working_path, "/~/", 3))) + /* It is referenced to the home directory, so strip the leading '/~/' */ + memcpy(real_path, working_path+3, 4 + working_path_len-3); else memcpy(real_path, working_path, 1 + working_path_len); } |