paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-18 01:49:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ unicodestring support for POpen(), and DefaultFileSystemCodePage support

Browse Source 
for POpen(RawByteString)

git-svn-id: branches/cpstrrtl@25134 -
This commit is contained in:
Jonas Maebe 2013-07-19 16:29:13 +00:00
parent 8538f48fda
commit 953e088c14
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
rtl/unix/unix.pp
View File

@ -114,8 +114,10 @@ function TellDir(p:pdir):TOff;
Function AssignPipe (var pipe_in,pipe_out:cint):cint; Function AssignPipe (var pipe_in,pipe_out:cint):cint;
Function AssignPipe (var pipe_in,pipe_out:text):cint; Function AssignPipe (var pipe_in,pipe_out:text):cint;
Function AssignPipe (var pipe_in,pipe_out:file):cint; Function AssignPipe (var pipe_in,pipe_out:file):cint;
Function POpen (var F:text;const Prog:Ansistring;rw:char):cint; Function POpen (var F:text;const Prog:RawByteString;rw:char):cint;
Function POpen (var F:file;const Prog:Ansistring;rw:char):cint; Function POpen (var F:file;const Prog:RawByteString;rw:char):cint;
Function POpen (var F:text;const Prog:UnicodeString;rw:char):cint;
Function POpen (var F:file;const Prog:UnicodeString;rw:char):cint;
Function AssignStream(Var StreamIn,Streamout:text;Const Prog:ansiString;const args : array of ansistring) : cint; Function AssignStream(Var StreamIn,Streamout:text;Const Prog:ansiString;const args : array of ansistring) : cint;
Function AssignStream(Var StreamIn,Streamout,streamerr:text;Const Prog:ansiString;const args : array of ansistring) : cint; Function AssignStream(Var StreamIn,Streamout,streamerr:text;Const Prog:ansiString;const args : array of ansistring) : cint;
Function GetDomainName:String; deprecated; // because linux only. Function GetDomainName:String; deprecated; // because linux only.
@ -655,7 +657,7 @@ begin
end; end;
Function POpen(var F:text;const Prog:Ansistring;rw:char):cint; Function POpen_internal(var F:text;const Prog:RawByteString;rw:char):cint;
{ {
Starts the program in 'Prog' and makes it's input or out put the Starts the program in 'Prog' and makes it's input or out put the
other end of a pipe. If rw is 'w' or 'W', then whatever is written to other end of a pipe. If rw is 'w' or 'W', then whatever is written to
@ -767,10 +769,10 @@ begin
move(pid,pl^,sizeof(pid)); move(pid,pl^,sizeof(pid));
textrec(f).closefunc:=@PCloseText; textrec(f).closefunc:=@PCloseText;
end; end;
POpen:=0; POpen_internal:=0;
end; end;
Function POpen(var F:file;const Prog:Ansistring;rw:char):cint; Function POpen_internal(var F:file;const Prog:RawByteString;rw:char):cint;
{ {
Starts the program in 'Prog' and makes it's input or out put the Starts the program in 'Prog' and makes it's input or out put the
other end of a pipe. If rw is 'w' or 'W', then whatever is written to other end of a pipe. If rw is 'w' or 'W', then whatever is written to
@ -880,9 +882,37 @@ begin
{ avoid alignment error on sparc } { avoid alignment error on sparc }
move(pid,pl^,sizeof(pid)); move(pid,pl^,sizeof(pid));
end; end;
POpen:=0; POpen_internal:=0;
end; end;
Function POpen(var F:text;const Prog:RawByteString;rw:char):cint;
begin
{ can't do the ToSingleByteFileSystemEncodedFileName() conversion inside
POpen_internal, because this may destroy the temp rawbytestring result
of that function in the parent before the child is finished with it }
POpen:=POpen_internal(F,ToSingleByteFileSystemEncodedFileName(Prog),rw);
end;
Function POpen(var F:file;const Prog:RawByteString;rw:char):cint;
begin
{ can't do the ToSingleByteFileSystemEncodedFileName() conversion inside
POpen_internal, because this may destroy the temp rawbytestring result
of that function in the parent before the child is finished with it }
POpen:=POpen_internal(F,ToSingleByteFileSystemEncodedFileName(Prog),rw);
end;
function POpen(var F: text; const Prog: UnicodeString; rw: char): cint;
begin
POpen:=POpen_internal(F,ToSingleByteFileSystemEncodedFileName(Prog),rw);
end;
function POpen(var F: file; const Prog: UnicodeString; rw: char): cint;
begin
POpen:=POpen_internal(F,ToSingleByteFileSystemEncodedFileName(Prog),rw);
end;
Function AssignStream(Var StreamIn,Streamout:text;Const Prog:ansiString;const args : array of ansistring) : cint; Function AssignStream(Var StreamIn,Streamout:text;Const Prog:ansiString;const args : array of ansistring) : cint;
{ {
Starts the program in 'Prog' and makes its input and output the Starts the program in 'Prog' and makes its input and output the