Diff
checker
テキスト
テキスト
画像
ドキュメント
Excel
フォルダ
Legal
Enterprise
デスクトップ
料金
ログイン
Diffchecker デスクトップのダウンロード
テキスト比較
2 つのテキスト ファイルの違いを見つける
ツール
履歴
ライブエディター
未変更行を折りたたむ
折り返しなし
レイアウト
分割
統合
比較精度
スマート
単語
文字
シンタックスハイライト
構文を選択
無視
テキスト変換
最初の差分へ移動
入力を編集
Diffchecker Desktop
Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手:あなたの差分はコンピューターから出ることはありません!
Desktopを入手
Untitled diff
作成日
9 年前
差分は期限切れになりません
クリア
エクスポート
共有
説明
131 削除
行
合計
削除
文字
合計
削除
この機能を引き続き使用するには、アップグレードしてください
Diff
checker
Pro
価格を見る
110 行
すべてコピー
103 追加
行
合計
追加
文字
合計
追加
この機能を引き続き使用するには、アップグレードしてください
Diff
checker
Pro
価格を見る
82 行
すべてコピー
コピー
コピー済み
コピー
コピー済み
function internalRuncommand(p:TProcess;var outputstring:string;
Function ReadInputPipe(const Pipe: TInputPipeStream; var BytesRead,OutputLen: integer; var OutputString: string): Boolean;
var stderrstring:string; var exitstatus:integer):integer;
var
var
available : integer;
numbytes,bytesread,available : integer;
NumBytes : integer;
outputlength, stderrlength : integer;
begin
stderrnumbytes,stderrbytesread : integer;
Result := False; available := 0;
begin
if(BytesRead<0)then BytesRead := 0;
result:=-1;
if(OutputLen<0)then OutputLen := 0;
try
repeat
try
if(Pipe=nil)then exit;
p.Options := [poUsePipes];
if(Pipe.NumBytesAvailable>0)
bytesread:=0;
then available := Pipe.NumBytesAvailable
outputlength:=0;
else break;
stderrbytesread:=0;
if(BytesRead+available>OutputLen)then
stderrlength:=0;
p.Execute;
while p.Running do
begin
// Only call ReadFromStream if Data from corresponding stream
// is already available, otherwise, on linux, the read call
// is blocking, and thus it is not possible to be sure to handle
// big data amounts bboth on output and stderr pipes. PM.
available:=P.Output.NumBytesAvailable;
if available > 0 then
begin
if (BytesRead + available > outputlength) then
begin
outputlength:=BytesRead + READ_BYTES;
Setlength(outputstring,outputlength);
end;
NumBytes := p.Output.Read(outputstring[1+bytesread], available);
if NumBytes > 0 then
Inc(BytesRead, NumBytes);
end
// The check for assigned(P.stderr) is mainly here so that
// if we use poStderrToOutput in p.Options, we do not access invalid memory.
else if assigned(P.stderr) and (P.StdErr.NumBytesAvailable > 0) then
begin
available:=P.StdErr.NumBytesAvailable;
if (StderrBytesRead + available > stderrlength) then
begin
stderrlength:=StderrBytesRead + READ_BYTES;
Setlength(stderrstring,stderrlength);
end;
StderrNumBytes := p.StdErr.Read(stderrstring[1+StderrBytesRead], available);
if StderrNumBytes > 0 then
Inc(StderrBytesRead, StderrNumBytes);
end
else
Sleep(100);
end;
// Get left output after end of execution
available:=P.Output.NumBytesAvailable;
while available > 0 do
begin
if (BytesRead + available > outputlength) then
begin
outputlength:=BytesRead + READ_BYTES;
Setlength(outputstring,outputlength);
end;
NumBytes := p.Output.Read(outputstring[1+bytesread], available);
if NumBytes > 0 then
Inc(BytesRead, NumBytes);
available:=P.Output.NumBytesAvailable;
end;
setlength(outputstring,BytesRead);
while assigned(P.stderr) and (P.Stderr.NumBytesAvailable > 0) do
begin
available:=P.Stderr.NumBytesAvailable;
if (StderrBytesRead + available > stderrlength) then
begin
stderrlength:=StderrBytesRead + READ_BYTES;
Setlength(stderrstring,stderrlength);
end;
StderrNumBytes := p.StdErr.Read(stderrstring[1+StderrBytesRead], available);
if StderrNumBytes > 0 then
Inc(StderrBytesRead, StderrNumBytes);
end;
setlength(stderrstring,StderrBytesRead);
exitstatus:=p.exitstatus;
result:=0; // we came to here, document that.
except
on e : Exception do
begin
begin
コピー
コピー済み
コピー
コピー済み
result:=1
;
OutputLen := BytesRead+READ_BYTES
;
setl
ength(
o
utput
s
tring,
BytesRead);
SetL
ength(
O
utput
S
tring,
OutputLen);
end;
try
try
NumBytes := Pipe.Read(OutputString[1+BytesRead], available);
if(NumBytes>0)
then Inc(BytesRead, NumBytes);
except
Result := False;
end;
end;
コピー
コピー済み
コピー
コピー済み
finally
Result := True;
end;
until false;
end;
Function InternalRunCommand(var P: TProcess; var Stdout, Stderr: string; var ExitStatus:integer): integer;
var
bytesread_stdout : integer;
outputlen_stdout : integer;
bytesread_stderr : integer;
outputlen_stderr : integer;
begin
Result := -1; if(P=nil)then exit;
try
try
P.Options := [poUsePipes];
bytesread_stdout := 0;
outputlen_stdout := 0;
bytesread_stderr := 0;
outputlen_stderr := 0;
P.Execute;
while(P.Running)do
begin
if(not ReadInputPipe(P.Output, bytesread_stdout, outputlen_stdout, Stdout))and
(not ReadInputPipe(P.Stderr, bytesread_stderr, outputlen_stderr, Stderr))
then sleep(100);
end;
//Get remaining output after end of execution:
ReadInputPipe(P.Output, bytesread_stdout, outputlen_stdout, Stdout);
ReadInputPipe(P.Stderr, bytesread_stderr, outputlen_stderr, Stderr);
ExitStatus := P.ExitStatus;
Result := 0; // we came to here, document that.
except
Result := 1;
end;
finally
FreeAndNil(P);
SetLength(Stdout,bytesread_stdout);
SetLength(Stderr,bytesread_stderr);
end;
end;
コピー
コピー済み
コピー
コピー済み
finally
end;
p.free;
end;
F
unction RunCommand(const
ExeN
ame:string;const
C
ommands:array of string;var
Stdout,StdErr
:string):
B
oolean;
end;
v
ar
E
xit
S
tatus
,i
: integer;
f
unction RunCommand(const
exen
ame:string;const
c
ommands:array of string;var
outputstring
:string):
b
oolean;
P
:
TProcess;
V
ar
begin
p : TProcess;
P :=
TProcess.
C
reate(nil);
i,
P
.Executable
:= ExeN
ame;
e
xit
s
tatus
: integer;
if high(commands)>=0
ErrorString
:
String;
then
for i:=low(
C
ommands) to high(
C
ommands)
begin
do P
.Parameters.
A
dd(
C
ommands[i]);
p:=
TProcess.
c
reate(nil);
R
esult
:= (I
nternal
RunC
ommand(
P,StdOut,StdErr,E
xit
S
tatus)=0
) and (E
xit
S
tatus
=0);
p
.Executable
:=exen
ame;
end;
if high(commands)>=0
then
for i:=low(
c
ommands) to high(
c
ommands)
do
p
.Parameters.
a
dd(
c
ommands[i]);
r
esult
:=i
nternal
runc
ommand(
p,outputstring,errorstring,e
xit
s
tatus)=0
;
if e
xit
s
tatus
<>0 then result:=false;
end;
保存された差分
原文
ファイルを開く
function internalRuncommand(p:TProcess;var outputstring:string; var stderrstring:string; var exitstatus:integer):integer; var numbytes,bytesread,available : integer; outputlength, stderrlength : integer; stderrnumbytes,stderrbytesread : integer; begin result:=-1; try try p.Options := [poUsePipes]; bytesread:=0; outputlength:=0; stderrbytesread:=0; stderrlength:=0; p.Execute; while p.Running do begin // Only call ReadFromStream if Data from corresponding stream // is already available, otherwise, on linux, the read call // is blocking, and thus it is not possible to be sure to handle // big data amounts bboth on output and stderr pipes. PM. available:=P.Output.NumBytesAvailable; if available > 0 then begin if (BytesRead + available > outputlength) then begin outputlength:=BytesRead + READ_BYTES; Setlength(outputstring,outputlength); end; NumBytes := p.Output.Read(outputstring[1+bytesread], available); if NumBytes > 0 then Inc(BytesRead, NumBytes); end // The check for assigned(P.stderr) is mainly here so that // if we use poStderrToOutput in p.Options, we do not access invalid memory. else if assigned(P.stderr) and (P.StdErr.NumBytesAvailable > 0) then begin available:=P.StdErr.NumBytesAvailable; if (StderrBytesRead + available > stderrlength) then begin stderrlength:=StderrBytesRead + READ_BYTES; Setlength(stderrstring,stderrlength); end; StderrNumBytes := p.StdErr.Read(stderrstring[1+StderrBytesRead], available); if StderrNumBytes > 0 then Inc(StderrBytesRead, StderrNumBytes); end else Sleep(100); end; // Get left output after end of execution available:=P.Output.NumBytesAvailable; while available > 0 do begin if (BytesRead + available > outputlength) then begin outputlength:=BytesRead + READ_BYTES; Setlength(outputstring,outputlength); end; NumBytes := p.Output.Read(outputstring[1+bytesread], available); if NumBytes > 0 then Inc(BytesRead, NumBytes); available:=P.Output.NumBytesAvailable; end; setlength(outputstring,BytesRead); while assigned(P.stderr) and (P.Stderr.NumBytesAvailable > 0) do begin available:=P.Stderr.NumBytesAvailable; if (StderrBytesRead + available > stderrlength) then begin stderrlength:=StderrBytesRead + READ_BYTES; Setlength(stderrstring,stderrlength); end; StderrNumBytes := p.StdErr.Read(stderrstring[1+StderrBytesRead], available); if StderrNumBytes > 0 then Inc(StderrBytesRead, StderrNumBytes); end; setlength(stderrstring,StderrBytesRead); exitstatus:=p.exitstatus; result:=0; // we came to here, document that. except on e : Exception do begin result:=1; setlength(outputstring,BytesRead); end; end; finally p.free; end; end; function RunCommand(const exename:string;const commands:array of string;var outputstring:string):boolean; Var p : TProcess; i, exitstatus : integer; ErrorString : String; begin p:=TProcess.create(nil); p.Executable:=exename; if high(commands)>=0 then for i:=low(commands) to high(commands) do p.Parameters.add(commands[i]); result:=internalruncommand(p,outputstring,errorstring,exitstatus)=0; if exitstatus<>0 then result:=false; end;
変更されたテキスト
ファイルを開く
Function ReadInputPipe(const Pipe: TInputPipeStream; var BytesRead,OutputLen: integer; var OutputString: string): Boolean; var available : integer; NumBytes : integer; begin Result := False; available := 0; if(BytesRead<0)then BytesRead := 0; if(OutputLen<0)then OutputLen := 0; repeat if(Pipe=nil)then exit; if(Pipe.NumBytesAvailable>0) then available := Pipe.NumBytesAvailable else break; if(BytesRead+available>OutputLen)then begin OutputLen := BytesRead+READ_BYTES; SetLength(OutputString,OutputLen); end; try try NumBytes := Pipe.Read(OutputString[1+BytesRead], available); if(NumBytes>0) then Inc(BytesRead, NumBytes); except Result := False; end; finally Result := True; end; until false; end; Function InternalRunCommand(var P: TProcess; var Stdout, Stderr: string; var ExitStatus:integer): integer; var bytesread_stdout : integer; outputlen_stdout : integer; bytesread_stderr : integer; outputlen_stderr : integer; begin Result := -1; if(P=nil)then exit; try try P.Options := [poUsePipes]; bytesread_stdout := 0; outputlen_stdout := 0; bytesread_stderr := 0; outputlen_stderr := 0; P.Execute; while(P.Running)do begin if(not ReadInputPipe(P.Output, bytesread_stdout, outputlen_stdout, Stdout))and (not ReadInputPipe(P.Stderr, bytesread_stderr, outputlen_stderr, Stderr)) then sleep(100); end; //Get remaining output after end of execution: ReadInputPipe(P.Output, bytesread_stdout, outputlen_stdout, Stdout); ReadInputPipe(P.Stderr, bytesread_stderr, outputlen_stderr, Stderr); ExitStatus := P.ExitStatus; Result := 0; // we came to here, document that. except Result := 1; end; finally FreeAndNil(P); SetLength(Stdout,bytesread_stdout); SetLength(Stderr,bytesread_stderr); end; end; Function RunCommand(const ExeName:string;const Commands:array of string;var Stdout,StdErr:string): Boolean; var ExitStatus,i : integer; P : TProcess; begin P := TProcess.Create(nil); P.Executable := ExeName; if high(commands)>=0 then for i:=low(Commands) to high(Commands) do P.Parameters.Add(Commands[i]); Result := (InternalRunCommand(P,StdOut,StdErr,ExitStatus)=0) and (ExitStatus=0); end;
違いを見つける