Std file list fix, viewing archive inside of archive
This commit is contained in:
parent
201ffd37be
commit
62cb7ed210
|
@ -949,6 +949,7 @@ Begin
|
|||
If Mask <> '' Then Begin
|
||||
ExecuteArchive (FName, '', Mask, 2);
|
||||
|
||||
If Not ArchiveList(Session.TempPath + Mask) Then Begin
|
||||
Session.io.PromptInfo[1] := Mask;
|
||||
|
||||
Session.io.OutFullLn(Session.GetPrompt(306));
|
||||
|
@ -960,8 +961,9 @@ Begin
|
|||
Session.io.AllowMCI := True;
|
||||
|
||||
If Session.io.NoFile Then
|
||||
Session.io.OutFullLn (Session.GetPrompt(305))
|
||||
Else
|
||||
Session.io.OutFullLn (Session.GetPrompt(305));
|
||||
End;
|
||||
|
||||
FileErase(Session.TempPath + Mask);
|
||||
End;
|
||||
End;
|
||||
|
@ -2479,6 +2481,10 @@ Var
|
|||
End;
|
||||
'P' : Begin
|
||||
PrevPage;
|
||||
|
||||
If CurPage = 1 Then
|
||||
TopDesc := 0;
|
||||
|
||||
DrawPage;
|
||||
End;
|
||||
'Q' : Begin
|
||||
|
@ -2726,9 +2732,6 @@ Procedure TFileBase.UploadFile;
|
|||
Var
|
||||
FileName : String;
|
||||
A : LongInt;
|
||||
D : DirStr;
|
||||
N : NameStr;
|
||||
E : ExtStr;
|
||||
OLD : RecFileBase;
|
||||
Blind : Boolean;
|
||||
Temp : String;
|
||||
|
@ -2737,6 +2740,11 @@ Var
|
|||
Found : Boolean;
|
||||
LogFile : Text;
|
||||
FileStatus : Boolean;
|
||||
{$IFNDEF UNIX}
|
||||
D : DirStr;
|
||||
N : NameStr;
|
||||
E : ExtStr;
|
||||
{$ENDIF}
|
||||
Begin
|
||||
OLD := FBase;
|
||||
Found := False;
|
||||
|
@ -2775,15 +2783,21 @@ Begin
|
|||
End;
|
||||
|
||||
If Config.FreeUL > 0 Then Begin
|
||||
{$IFDEF UNIX}
|
||||
If DiskFree(0) DIV 1024 < Config.FreeUL Then Begin
|
||||
Session.io.OutFullLn (Session.GetPrompt(81));
|
||||
FBase := OLD;
|
||||
Exit;
|
||||
End;
|
||||
{$ELSE}
|
||||
FSplit (FBase.Path, D, N, E);
|
||||
|
||||
// this might be broken?
|
||||
|
||||
If DiskFree(Ord(UpCase(D[1])) - 64) DIV 1024 < Config.FreeUL Then Begin
|
||||
Session.io.OutFullLn (Session.GetPrompt(81));
|
||||
FBase := OLD;
|
||||
Exit;
|
||||
End;
|
||||
{$ENDIF}
|
||||
End;
|
||||
|
||||
Blind := Session.io.GetYN(Session.GetPrompt(375), False);
|
||||
|
|
Loading…
Reference in New Issue