diff --git a/src/shared/envvars.pas b/src/shared/envvars.pas
index 941b8e0b78d548ef5b90cc1f71341e6c001f4853..5c60fd0d7c1adefe3508ebaf7f5d3cc948512820 100644 (file)
--- a/src/shared/envvars.pas
+++ b/src/shared/envvars.pas
interface
-uses SysUtils, CTypes;
+ uses SysUtils, CTypes;
-function SetEnvVar(const VarName: AnsiString; const VarVal: AnsiString): Boolean;
+ function SetEnvVar(const VarName: AnsiString; const VarVal: AnsiString): Boolean;
+ function GetUserName: String;
implementation
+ uses
+{$IFDEF WINDOWS}
+ Windows,
+{$ENDIF}
+ utils;
+
+
{$IFDEF WINDOWS}
-uses Windows;
function setenv(const VarStr: PChar; const VarVal: PChar; Repl: cint): cint;
begin
if (SetEnvironmentVariable(VarStr, VarVal)) then
Result := (setenv(PChar(VarName), PChar(VarVal), 1) = 0);
end;
+ (* Get system username already in cp1251 *)
+ function GetUserName: AnsiString;
+ var i: Integer;
+ begin
+ {$IF DEFINED(WINDOWS)}
+ Result := utf2win(UTF8String(SysUtils.GetEnvironmentVariable(WideString('USERNAME'))));
+ {$ELSEIF DEFINED(UNIX)}
+ Result := utf2win(SysUtils.GetEnvironmentVariable('USER'));
+ {$ELSE}
+ Result := '';
+ {$ENDIF}
+ (* invalidate username with non-cp1251 symbols *)
+ i := Low(Result);
+ while i <= High(Result) do
+ begin
+ if Result[i] = '?' then
+ Result := '';
+ Inc(i)
+ end
+ end;
+
end.