Bläddra i källkod

* Fixed dir separator for linux

peter 25 år sedan
förälder
incheckning
be8f277b80
1 ändrade filer med 15 tillägg och 6 borttagningar
  1. 15 6
      utils/delp.pp

+ 15 - 6
utils/delp.pp

@@ -28,6 +28,12 @@ const
   Title     = 'DelPascal';
   Title     = 'DelPascal';
   Copyright = 'Copyright (c) 1999-2000 by the Free Pascal Development Team';
   Copyright = 'Copyright (c) 1999-2000 by the Free Pascal Development Team';
 
 
+{$ifdef linux}
+  DirSep = '/';
+{$else}
+  DirSep = '\';
+{$endif}
+
 function DStr(l:longint):string;
 function DStr(l:longint):string;
 var
 var
   TmpStr : string[32];
   TmpStr : string[32];
@@ -197,14 +203,14 @@ var
   hp     : pmaskitem;
   hp     : pmaskitem;
   found  : boolean;
   found  : boolean;
   basedir : string;
   basedir : string;
-  
+
 begin
 begin
   ProcessOptions;
   ProcessOptions;
-  if Optind<>ParamCount then 
+  if Optind<>ParamCount then
     Usage;
     Usage;
   BaseDir:=Paramstr(OptInd);
   BaseDir:=Paramstr(OptInd);
-  If BaseDir[Length(BaseDir)]<>'\' then 
-    BaseDir:=BaseDir+'\';
+  If BaseDir[Length(BaseDir)]<>DirSep then
+    BaseDir:=BaseDir+DirSep;
   AddMask('*.ppw *.ow *.aw *.sw');
   AddMask('*.ppw *.ow *.aw *.sw');
   AddMask('ppas.bat ppas.sh link.res fpcmaked fpcmade fpcmade.*');
   AddMask('ppas.bat ppas.sh link.res fpcmaked fpcmade fpcmade.*');
   AddMask('*.tpu *.tpp *.tpw *.tr');
   AddMask('*.tpu *.tpp *.tpw *.tr');
@@ -218,7 +224,7 @@ begin
       writeln(Copyright);
       writeln(Copyright);
       Writeln;
       Writeln;
     end;
     end;
-  FindFirst(basedir+'*.*',$20,Dir);
+  FindFirst(basedir+'*.*',anyfile,Dir);
   Total:=0;
   Total:=0;
   while (doserror=0) do
   while (doserror=0) do
    begin
    begin
@@ -258,7 +264,10 @@ begin
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.9  2000-01-24 16:31:12  michael
+  Revision 1.10  2000-01-26 21:15:00  peter
+    * Fixed dir separator for linux
+
+  Revision 1.9  2000/01/24 16:31:12  michael
   + Adapted delp so it accepts a directory as an option
   + Adapted delp so it accepts a directory as an option
 
 
   Revision 1.8  2000/01/23 16:40:28  peter
   Revision 1.8  2000/01/23 16:40:28  peter