refact CommandLine code

Alexey-T · Mar 26, 2017 · dcd6c0d · dcd6c0d
1 parent 852f85d
commit dcd6c0d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/app/formmain_commandline.inc b/app/formmain_commandline.inc
@@ -55,10 +55,15 @@ begin
       Delete(SParam, 1, Pos('=', SParam));
       FOption_Encoding:= AppEncodingShortnameToFullname(SParam);
       if FOption_Encoding='' then
-        MsgStdout('CudaText: unknown encoding name: '+SParam);
+        MsgStdout(Format(msgCommandLineUnknownEncoding, [SParam]));
       Continue;
     end;
 
+    {$ifdef darwin}
+    //macOS gives param -psn** for debugger
+    if SBeginsWith(SParam, '-psn') then Continue;
+    {$endif}
+
     MsgStdout(Format(msgCommandLineUnknownOption, [SParam]));
     Halt;
   end;
@@ -82,11 +87,6 @@ begin
   begin
     fn:= ParamStrUTF8(i);
 
-    {$ifdef darwin}
-    //OSX 10.8 gives param "-psn**"
-    if SBeginsWith(fn, '-psn') then Continue;
-    {$endif}
-
     //ignore special params
     if SBeginsWith(fn, '-') then Continue;
 

diff --git a/app/proc_msg.pas b/app/proc_msg.pas
@@ -200,6 +200,8 @@ interface
 
   msgCommandLineUnknownOption =
       'CudaText: unknown key %s'#10'Run "cudatext --help" to see command line help.';
+  msgCommandLineUnknownEncoding =
+      'CudaText: unknown encoding: %s';
   msgCommandLineVersion =
       'CudaText version %s';