eric
/
mysticbbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Std file list fix, viewing archive inside of archive

This commit is contained in:
mysticbbs 2013-02-22 20:46:23 -05:00
parent 201ffd37be
commit 62cb7ed210
1 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mystic/bbs_filebase.pas
View File

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