mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

UPD: Save connection port in FTP plugin

Browse source
This commit is contained in:
Alexander Koblov 2009-11-08 11:20:31 +00:00
commit d0615be222
3 changed files with 61 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/wfx/ftp/src/FtpConfDlg.pas
View file

@ -34,7 +34,7 @@ function ShowFtpConfDlg: Boolean;
implementation
uses
FtpFunc;
FtpFunc, FtpUtils;
function DlgProc (pDlg: PtrUInt; DlgItemName: PChar; Msg, wParam, lParam: PtrInt): PtrInt; stdcall;
var
@ -50,6 +50,8 @@ begin
Data:= PtrInt(PWideChar(wsText));
SendDlgMsg(pDlg, 'edtName', DM_SETTEXT, Data, 0);
wsText:= gConnection.Host;
if gConnection.Port <> EmptyStr then
wsText:= wsText + ':' + gConnection.Port;
Data:= PtrInt(PWideChar(wsText));
SendDlgMsg(pDlg, 'edtHost', DM_SETTEXT, Data, 0);
wsText:= gConnection.UserName;
@ -117,7 +119,8 @@ begin
gConnection.ConnectionName:= wsText;
Data:= SendDlgMsg(pDlg, 'edtHost', DM_GETTEXT, 0, 0);
wsText:= PWideChar(Data);
gConnection.Host:= wsText;
gConnection.Host:= ExtractConnectionHost(wsText);
gConnection.Port:= ExtractConnectionPort(wsText);
Data:= SendDlgMsg(pDlg, 'edtUserName', DM_GETTEXT, 0, 0);
wsText:= PWideChar(Data);
gConnection.UserName:= wsText;

2
plugins/wfx/ftp/src/ftpfunc.pas
View file

@ -474,7 +474,7 @@ begin
begin
FillChar(FindData, SizeOf(FindData), 0);
StrPCopy(FindData.cFileName, FtpSend.FtpList.Items[I].FileName);
FindData.dwFileAttributes := FindData.dwFileAttributes or faUnixMode;
FindData.dwFileAttributes := FindData.dwFileAttributes or FILE_ATTRIBUTE_UNIX_MODE;
if FtpSend.FtpList.Items[I].Directory then
FindData.dwFileAttributes := FindData.dwFileAttributes or FILE_ATTRIBUTE_DIRECTORY
else

85
plugins/wfx/ftp/src/ftputils.pas
View file

@ -29,54 +29,54 @@ unit FtpUtils;
interface
uses
Classes, SysUtils;
Classes, SysUtils;
const
faUnixMode = $80000000;
const
S_IFMT = $F000;
S_IFMT = $F000;
{ first-in/first-out (FIFO/pipe) }
S_IFIFO = $1000;
S_IFIFO = $1000;
{ character-special file (tty/console) }
S_IFCHR = $2000;
S_IFCHR = $2000;
{ directory }
S_IFDIR = $4000;
S_IFDIR = $4000;
{ blocking device (unused) }
S_IFBLK = $6000;
S_IFBLK = $6000;
{ regular }
S_IFREG = $8000;
S_IFREG = $8000;
{ symbolic link (unused) }
S_IFLNK = $A000;
S_IFLNK = $A000;
{ Berkeley socket }
S_IFSOCK = $C000;
S_IRWXU = $01C0;
S_IRUSR = $0100;
S_IWUSR = $0080;
S_IXUSR = $0040;
S_IREAD = S_IRUSR;
S_IWRITE = S_IWUSR;
S_IEXEC = S_IXUSR;
S_IFSOCK = $C000;
S_IRWXU = $01C0;
S_IRUSR = $0100;
S_IWUSR = $0080;
S_IXUSR = $0040;
S_IREAD = S_IRUSR;
S_IWRITE = S_IWUSR;
S_IEXEC = S_IXUSR;
{ POSIX file modes: group permission... }
S_IRWXG = $0038;
S_IRGRP = $0020;
S_IWGRP = $0010;
S_IXGRP = $0008;
S_IRWXG = $0038;
S_IRGRP = $0020;
S_IWGRP = $0010;
S_IXGRP = $0008;
{ POSIX file modes: other permission... }
S_IRWXO = $0007;
S_IROTH = $0004;
S_IWOTH = $0002;
S_IXOTH = $0001;
S_IRWXO = $0007;
S_IROTH = $0004;
S_IWOTH = $0002;
S_IXOTH = $0001;
{ POSIX setuid(), setgid(), and sticky... }
S_ISUID = $0800;
S_ISGID = $0400;
S_ISVTX = $0200;
S_ISUID = $0800;
S_ISGID = $0400;
S_ISVTX = $0200;
function ModeStr2Mode(const sMode: String): Integer;
function EncodeBase64(Data: AnsiString): AnsiString;
function DecodeBase64(Data: AnsiString): AnsiString;
function ExtractConnectionHost(Connection: AnsiString): AnsiString;
function ExtractConnectionPort(Connection: AnsiString): AnsiString;
implementation
uses
@ -163,5 +163,30 @@ begin
end;
end;
function ExtractConnectionHost(Connection: AnsiString): AnsiString;
var
I: Integer;
begin
I:= Pos(':', Connection);
if I > 0 then
Result:= Copy(Connection, 1, I - 1)
else
Result:= Connection;
end;
function ExtractConnectionPort(Connection: AnsiString): AnsiString;
var
I, J: Integer;
begin
Result:= EmptyStr;
I:= Pos(':', Connection);
if I > 0 then
begin
J:= Pos('/', Connection);
if J = 0 then J:= MaxInt;
Result:= Trim(Copy(Connection, I + 1, J));
end;
end;
end.