tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-27 16:04:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add multiple ../../.. support in sftp-server for changing directories or get/put

Browse Source 
Before one could provide only one .. ; now it can be any numbers. cd
../../..  or get ../backup/myfile.c  --- all these formations now work.
This commit is contained in:
quamrulmina 2015-12-31 17:06:32 -06:00
parent 39c00bff7e
commit 6301972e69
1 changed files with 46 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
openbsd-compat/realpath.c
View File

@ -203,43 +203,34 @@ realpath(const char *path, char resolved[PATH_MAX])
#else #else
void backslashconvert(char *str)
{
while (*str) {
if (*str == '/')
*str = '\\'; // convert forward slash to back slash
str++;
}
}
// convert back slash to forward slash
void slashconvert(char *str)
{
while (*str) {
if (*str == '\\')
*str = '/'; // convert back slash to forward slash
str++;
}
}
char *realpathWin32(const char *path, char resolved[PATH_MAX]) char *realpathWin32(const char *path, char resolved[PATH_MAX])
{ {
size_t path_len;
unsigned int lastSlash;
char realpath[PATH_MAX]; char realpath[PATH_MAX];
char * pch;
path_len = strlcpy(realpath, path+1, sizeof(realpath)); strlcpy(resolved, path + 1, sizeof(realpath));
backslashconvert(resolved);
char * pchMac; PathCanonicalizeA(realpath, resolved);
pchMac = strstr (realpath, "._"); slashconvert(realpath);
if (pchMac != NULL)
{
pchMac[0] = '\0';
pchMac++;
pchMac++;
strcat(realpath, pchMac);
}
pch = strrchr(realpath, '/');
lastSlash = pch - realpath + 1;
if(path_len == lastSlash)
{
realpath[lastSlash-1] = '\0';
}
pch = strrchr(realpath,'.');
if(pch != NULL)
{
if (realpath[pch-realpath - 1] == '.')
{
realpath[pch - realpath - 2] = '\0';
pch = strrchr(realpath, '/');
if(pch != NULL)
realpath[pch - realpath] = '\0';
}
}
/* /*
* Store terminating slash in 'X:/' on Windows. * Store terminating slash in 'X:/' on Windows.
@ -256,48 +247,21 @@ char *realpathWin32(const char *path, char resolved[PATH_MAX])
return resolved; return resolved;
} }
// like realpathWin32() but takes out the first slash so that windows systems can work on the actual file or directory
char *realpathWin32i(const char *path, char resolved[PATH_MAX]) char *realpathWin32i(const char *path, char resolved[PATH_MAX])
{ {
size_t path_len;
unsigned int lastSlash;
char realpath[PATH_MAX]; char realpath[PATH_MAX];
char * pch;
if (path[0] != '/') { if (path[0] != '/') {
// absolute form x:/abc/def given, no first slash to take out // absolute form x:/abc/def given, no first slash to take out
path_len = strlcpy(realpath, path, sizeof(realpath)); strlcpy(resolved, path, sizeof(realpath));
} }
else else
path_len = strlcpy(realpath, path + 1, sizeof(realpath)); strlcpy(resolved, path + 1, sizeof(realpath));
char * pchMac; backslashconvert(resolved);
pchMac = strstr(realpath, "._"); PathCanonicalizeA(realpath, resolved);
if (pchMac != NULL) slashconvert(realpath);
{
pchMac[0] = '\0';
pchMac++;
pchMac++;
strcat(realpath, pchMac);
}
pch = strrchr(realpath, '/');
lastSlash = pch - realpath + 1;
if (path_len == lastSlash)
{
realpath[lastSlash - 1] = '\0';
}
pch = strrchr(realpath, '.');
if (pch != NULL)
{
if (realpath[pch - realpath - 1] == '.')
{
realpath[pch - realpath - 2] = '\0';
pch = strrchr(realpath, '/');
if (pch != NULL)
realpath[pch - realpath] = '\0';
}
}
/* /*
* Store terminating slash in 'X:/' on Windows. * Store terminating slash in 'X:/' on Windows.