Browse Source

* check ioresult after getdir calls

peter 26 years ago
parent
commit
2d3afc0d63
3 changed files with 23 additions and 7 deletions
  1. 6 1
      rtl/go32v2/dos.pp
  2. 11 5
      rtl/linux/linux.pp
  3. 6 1
      rtl/win32/dos.pp

+ 6 - 1
rtl/go32v2/dos.pp

@@ -738,6 +738,7 @@ end;
          i,j  : longint;
        begin
           getdir(0,s);
+          i:=ioresult;
           if LFNSupport then
            begin
              pa:=path;
@@ -759,6 +760,7 @@ end;
             begin
                { we must get the right directory }
                getdir(ord(pa[1])-ord('A')+1,s);
+               i:=ioresult;
                if (ord(pa[0])>2) and (pa[3]<>'\') then
                  if pa[1]=s[1] then
                    begin
@@ -1003,7 +1005,10 @@ End;
 end.
 {
   $Log$
-  Revision 1.7  1999-05-04 23:55:50  pierre
+  Revision 1.8  1999-05-08 19:47:22  peter
+    * check ioresult after getdir calls
+
+  Revision 1.7  1999/05/04 23:55:50  pierre
    * unneeded assembler code converted to pascal
 
   Revision 1.6  1999/04/28 11:42:44  peter

+ 11 - 5
rtl/linux/linux.pp

@@ -2830,9 +2830,9 @@ end;
 
 Function FExpand(Const Path:PathStr):PathStr;
 var
-  temp : pathstr;
-  i,j  : longint;
-  p    : pchar;
+  temp  : pathstr;
+  i,j,k : longint;
+  p     : pchar;
 Begin
 {Remove eventual drive - doesn't exist in Linux}
   if path[2]=':' then
@@ -2853,7 +2853,10 @@ Begin
   if temp='' then
    begin
      if path[i]<>'/' then
-      getdir(0,temp)
+      begin
+        getdir(0,temp)
+        k:=ioresult;
+      end
      else
       inc(i);
      temp:=temp+'/'+copy(path,i,length(path)-i+1)+'/';
@@ -3543,7 +3546,10 @@ End.
 
 {
   $Log$
-  Revision 1.35  1999-04-22 14:48:55  peter
+  Revision 1.36  1999-05-08 19:47:24  peter
+    * check ioresult after getdir calls
+
+  Revision 1.35  1999/04/22 14:48:55  peter
     * fixed direct asm
 
   Revision 1.34  1999/03/29 16:03:10  peter

+ 6 - 1
rtl/win32/dos.pp

@@ -617,6 +617,7 @@ var
    i,j  : longint;
 begin
    getdir(0,s);
+   i:=ioresult;
    if FileNameCaseSensitive then
     pa:=path
    else
@@ -648,6 +649,7 @@ begin
  if length(pa) = 2 then
   begin
     getdir(byte(pa[1])-64,s);
+    i:=ioresult;
     pa := s;
   end;
 
@@ -879,7 +881,10 @@ End;
 end.
 {
   $Log$
-  Revision 1.15  1999-04-28 11:42:52  peter
+  Revision 1.16  1999-05-08 19:47:27  peter
+    * check ioresult after getdir calls
+
+  Revision 1.15  1999/04/28 11:42:52  peter
     + FileNameCaseSensetive boolean
 
   Revision 1.14  1999/04/08 12:23:07  peter