From: MegaBrutal Date: Sat, 6 Dec 2014 00:35:52 +0000 (+0100) Subject: MgSMTP 0.9s rc1 X-Git-Tag: 0.9s~4 X-Git-Url: http://git.megabrutal.com/?p=mgsmtp.git;a=commitdiff_plain;h=4fc041f69ece7911d7c6f2400817054ca2d93316 MgSMTP 0.9s rc1 Improved command-line argument parsing, which will make my job easier when I'll introduce the /CONFIG, /WORKDIR arguments. Now not only the first argument is parsed, but all of them. I've also edited todo.txt to reflect my vision better of further development. This is Release Candidate 1. modified: Common.pas modified: MgSMTP.pas new file: buildall.bat modified: todo.txt --- diff --git a/Common.pas b/Common.pas index b7a6ec8..7260c08 100644 --- a/Common.pas +++ b/Common.pas @@ -40,16 +40,16 @@ type TArgumentParser = class - constructor Create(RawArguments: TStringArray; AllowedPrefixes: TStringArray = []); + constructor Create(RawArguments: array of string; AllowedPrefixes: array of string); destructor Destroy; override; private Arguments: array of TArgument; - procedure ParseArgument(Arg: string; const AllowedPrefixes: TStringArray); + procedure ParseArgument(Arg: string; const AllowedPrefixes: array of string); public function GetArgument(ID: integer): TArgument; function IsPresent(ArgumentName: string): boolean; function GetValue(ArgumentName: string; DefValue: string = ''): string; - function ValidateArguments(ValidArguments: TStringArray): integer; + function ValidateArguments(ValidArguments: array of string): integer; end; @@ -219,6 +219,14 @@ implementation { Unit-private functions/prodecures: } +function InStringArray(const S: string; const SA: array of string): boolean; +var i: integer; +begin + i:= 0; + while (i < Length(SA)) and (SA[i] <> S) do Inc(i); + Result:= i < Length(SA); +end; + function MakeTimeOffsetStr(TimeOffset: integer): string; var CorrS: string; CorrI: integer; begin @@ -389,6 +397,14 @@ begin end; end; +function CmdlineToStringArray: TStringArray; +var i: integer; +begin + SetLength(Result, ParamCount); + for i:= 1 to ParamCount do + Result[i-1]:= ParamStr(i); +end; + function UnixTimeStamp(DateTime: TDateTime): TUnixTimeStamp; begin {Result:= Trunc((DateTime - EncodeDate(1970, 1 ,1)) * 24 * 60 * 60);} @@ -425,7 +441,7 @@ end; { Object constructors/destructors: } -constructor TArgumentParser.Create(RawArguments: TStringArray; AllowedPrefixes: TStringArray = []); +constructor TArgumentParser.Create(RawArguments: array of string; AllowedPrefixes: array of string); var i: integer; begin for i:= 0 to Length(RawArguments) - 1 do @@ -495,7 +511,7 @@ end; { Object methods: } -procedure TArgumentParser.ParseArgument(Arg: string; const AllowedPrefixes: TStringArray); +procedure TArgumentParser.ParseArgument(Arg: string; const AllowedPrefixes: array of string); var i, n: integer; found: boolean; begin { Strip prefix if present. } @@ -548,16 +564,16 @@ begin Result:= DefValue; end; -function TArgumentParser.ValidateArguments(ValidArguments: TStringArray): integer; +function TArgumentParser.ValidateArguments(ValidArguments: array of string): integer; { Returns -1 if all arguments are valid. Otherwise, returns the ID of the first invalid parameter. } var i: integer; begin i:= 0; - while (i < Length(Arguments)) and (Arguments[i] in ValidArguments) do + while (i < Length(Arguments)) and InStringArray(Arguments[i].Option, ValidArguments) do Inc(i); - if i < Length(Arguments) then + if i >= Length(Arguments) then Result:= -1 else Result:= i; diff --git a/MgSMTP.pas b/MgSMTP.pas index cecfdc9..08eaa2a 100644 --- a/MgSMTP.pas +++ b/MgSMTP.pas @@ -42,19 +42,24 @@ const ) ); + ArgumentPrefixes: array[0..2] of string = ('/', '--', '-'); + ValidArguments: array[0..4] of string = ('?', 'HELP', 'INSTALL', 'UNINSTALL', 'USERMODE'); + { For development test builds, you can add a developer comment here to document what bugfix/feature are you testing with the actual build. This will be logged to help you differentiate outputs of subsequent builds in your logs. If left empty, it won't be added to the logs. } - DEVCOMMENT = 'Testing new parameters'; + DEVCOMMENT = 'Release Candidate 1'; var + Cmdline: TArgumentParser; Config: TINIFile; hSCManager, hService: THandle; hSvcStatusHandle: THandle; SvcStatus: TServiceStatus; ServiceMode, Stopping: boolean; + WrongArgument: integer; procedure AddDevComment(Log: TStreamLogger); @@ -236,17 +241,14 @@ begin Out.writeln; { TODO: Process arguments here. } + Cmdline:= TArgumentParser.Create(CmdlineToStringArray, ArgumentPrefixes); + WrongArgument:= Cmdline.ValidateArguments(ValidArguments); - ServiceMode:= false; - - if ParamCount > 0 then begin + if WrongArgument = -1 then begin - if UpperCase(ParamStr(1)) = '/USERMODE' then begin - Out.writeln('Starting MgSMTP in user mode...'); - Service(0, nil); - end + ServiceMode:= false; - else if ParamStr(1) = '/?' then begin + if Cmdline.IsPresent('?') or Cmdline.IsPresent('HELP') then begin Out.writeln('Supported arguments:'); Out.writeln('/INSTALL - registers the actual MgSMTP binary'); Out.writeln(' as a Windows service.'); @@ -265,11 +267,11 @@ begin Out.writeln('https://sourceforge.net/projects/mgsmtp/'); end - else if (UpperCase(ParamStr(1)) = '/INSTALL') or (UpperCase(ParamStr(1)) = '/UNINSTALL') then begin + else if (Cmdline.IsPresent('INSTALL') or Cmdline.IsPresent('UNINSTALL')) then begin { Register / unregister service. } hSCManager:= OpenSCManager(nil, nil, SC_MANAGER_ALL_ACCESS); if hSCManager <> 0 then begin - if UpperCase(ParamStr(1)) = '/INSTALL' then begin + if Cmdline.IsPresent('INSTALL') then begin if CreateService(hSCManager, 'MgSMTP', 'MegaBrutal''s SMTP Server (MgSMTP)', SC_MANAGER_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, @@ -283,7 +285,7 @@ begin else Out.writeln('CreateService failed!'); end - else if UpperCase(ParamStr(1)) = '/UNINSTALL' then begin + else if Cmdline.IsPresent('UNINSTALL') then begin hService:= OpenService(hSCManager, 'MgSMTP', SC_MANAGER_ALL_ACCESS); if hService <> 0 then begin if DeleteService(hService) then @@ -292,25 +294,39 @@ begin Out.writeln('DeleteService failed!'); end else Out.writeln('OpenService failed!'); - end - else Out.writeln('Unknown parameter.'); + end; end else Out.writeln('OpenSCManager failed!'); end - else Out.writeln('Unknown parameter specified!'); + + else begin + if Cmdline.IsPresent('USERMODE') then begin + Out.writeln('Starting MgSMTP in user mode...'); + Service(0, nil); + end + else begin + Out.writeln('Trying to contact Service Control Manager...'); + Out.writeln('(If you see this message on console, you tried to'); + Out.writeln('start up the program incorrectly. Your current'); + Out.writeln('attempt will fail, or it may hang under Wine.'); + Out.writeln; + ServiceMode:= true; + if not StartServiceCtrlDispatcher(ServiceTable) then begin + ServiceMode:= false; + Out.writeln('Failed!'); + Out.writeln; + Out.writeln('You need to start MgSMTP as a service,'); + Out.writeln('or supply proper arguments!'); + Out.writeln('Issue with /? for more information.'); + end; + end; + end + end + else begin - Out.writeln('Trying to contact Service Control Manager...'); - ServiceMode:= true; - if not StartServiceCtrlDispatcher(ServiceTable) then begin - ServiceMode:= false; - Out.writeln('Failed!'); - Out.writeln; - Out.writeln('You need to start MgSMTP as a service,'); - Out.writeln('or supply proper arguments!'); - Out.writeln('Issue with /? for more information.'); - end; + Out.writeln('Invalid argument: ' + Cmdline.GetArgument(WrongArgument).Option + '!'); end; end. diff --git a/buildall.bat b/buildall.bat new file mode 100644 index 0000000..492ae9f --- /dev/null +++ b/buildall.bat @@ -0,0 +1,10 @@ +@echo off +del mgsmtp.exe mgsmtp64.exe +echo Building for Win32... +echo. +del *.o *.ppu *.a +fpc -omgsmtp.exe MgSMTP.pas +echo Building for Win64... +echo. +del *.o *.ppu *.a +ppcrossx64 -omgsmtp64.exe MgSMTP.pas \ No newline at end of file diff --git a/todo.txt b/todo.txt index dfd4890..7a392c5 100644 --- a/todo.txt +++ b/todo.txt @@ -10,18 +10,21 @@ Future: - Log outgoing SMTP transactions - Show delivery thread IDs - Watchdog for delivery threads -- IPv6 -- Bind to user-specified IPs - VRFY? - Show authenticated user in "Received" headers - Delivery threads should finish sooner +- Ensure random spool object names +- DNSBL -v0.9t: +v0.9u: - NATIVE LINUX PORT! -- DNSBL + +v0.9t: - Option to disable MX lookups -- Ensure random spool object names +- Separate config files or work directories supplied in parameters - Process CTRL-C properly to quit from user mode gracefully +- IPv6 +- Bind to user-specified IPs v0.9s: + Change "Client disconnected, and thread exited successfully." to "Client disconnected." @@ -32,13 +35,13 @@ v0.9s: + Fix service mode not working when compiled with FPC 2.6.2! + Alternate mailbox names with + signs (e.g. "megabrutal+games@domain") + Domain-scope mailbox settings -- Separate config files or work directories supplied in parameters + Improved Wine compatibility + Consistent handling of local/relay spool objects + Implement Win64 support + Fix PRESHUTDOWN + Enforce ASCII printable characters in commands + Developer comment for test/debug builds +- More efficient command-line parsing v0.9r: + Forwarding