CVS update: freexp

2006-04-16 Diskussionsfäden FreeXP CVS-Server

Date:   Sunday April 16, 2006 @ 16:13
Author: mw

Update of /server/cvs/freexp
In directory m25s18:/tmp/cvs-serv26489

Modified Files:
md5.pas 
Log Message:
MW: - IO-Fehler beseitigt.


===
File: no file md5.pas   Status: Needs Checkout

   Working revision:1.6 Sun Apr 16 14:13:04 2006
   Repository revision: 1.6 /server/cvs/freexp/md5.pas,v

   Existing Tags:
Branch_3_40_Release (branch: 1.1.2)



FreeXP CVS-Mailingliste
CVS-List@freexp.de
http://www.freexp.de/cgi-bin/mailman/listinfo/cvs-list


CVS update: freexp

2006-04-16 Diskussionsfäden FreeXP CVS-Server

Date:   Sunday April 16, 2006 @ 16:13
Author: mw

Update of /server/cvs/freexp
In directory m25s18:/tmp/cvs-serv26545

Modified Files:
touch.pas 
Log Message:
MW: - FreeXP-Extension (MD5-Summe) eingebaut.


===
File: no file touch.pas Status: Needs Checkout

   Working revision:1.25Sun Apr 16 14:13:47 2006
   Repository revision: 1.25/server/cvs/freexp/touch.pas,v

   Existing Tags:
RC4_3_40_R2 (revision: 1.22)
RC4_3_40_R1 (revision: 1.22)
RC4_3_40_Fixes  (branch: 1.22.4)
Release_3_21_R1 (revision: 1.1.2.22)
RC4_3_40(revision: 1.22)
Branch_3_40_Release (branch: 1.22.2)
Release_3_21(revision: 1.1.2.20)
Bezugsverkettung_2  (revision: 1.21)
Bezuegsverkettung   (revision: 1.21)
Extented-Command2   (revision: 1.21)
Extended-Interpreter(revision: 1.21)
Citycarrier3(revision: 1.21)
Citycarrier2(revision: 1.21)
Citycarrier (revision: 1.21)
GnuPG_1 (revision: 1.21)
DOSBOX-Edition  (revision: 1.8)
before_FreeXP   (revision: 1.1.2.6)
Snapshot_31082003   (revision: 1.6)
Branch_3_20_Release (branch: 1.1.2)



FreeXP CVS-Mailingliste
CVS-List@freexp.de
http://www.freexp.de/cgi-bin/mailman/listinfo/cvs-list


CVS update: freexp

2006-04-16 Diskussionsfäden FreeXP CVS-Server

Date:   Sunday April 16, 2006 @ 16:18
Author: mw

Update of /server/cvs/freexp
In directory m25s18:/tmp/cvs-serv27385

Modified Files:
  Tag: Branch_3_40_Release
md5.pas 
Log Message:
MW: - IO-Fehler beseitigt.


===
File: no file md5.pas   Status: Needs Checkout

   Working revision:1.1.2.5 Sun Apr 16 14:18:55 2006
   Repository revision: 1.1.2.5 /server/cvs/freexp/md5.pas,v
   Sticky Tag:  Branch_3_40_Release (branch: 1.1.2)

   Existing Tags:
Branch_3_40_Release (branch: 1.1.2)



FreeXP CVS-Mailingliste
CVS-List@freexp.de
http://www.freexp.de/cgi-bin/mailman/listinfo/cvs-list


CVS update: freexp

2006-04-16 Diskussionsfäden FreeXP CVS-Server

Date:   Sunday April 16, 2006 @ 16:21
Author: mw

Update of /server/cvs/freexp
In directory m25s18:/tmp/cvs-serv28058

Modified Files:
  Tag: Branch_3_40_Release
touch.pas 
Log Message:
MW: - FreeXP-Extension eingebaut (MD5-Summen)


===
File: no file touch.pas Status: Needs Checkout

   Working revision:1.22.2.2Sun Apr 16 14:21:29 2006
   Repository revision: 1.22.2.2/server/cvs/freexp/touch.pas,v
   Sticky Tag:  Branch_3_40_Release (branch: 1.22.2)

   Existing Tags:
RC4_3_40_R2 (revision: 1.22)
RC4_3_40_R1 (revision: 1.22)
RC4_3_40_Fixes  (branch: 1.22.4)
Release_3_21_R1 (revision: 1.1.2.22)
RC4_3_40(revision: 1.22)
Branch_3_40_Release (branch: 1.22.2)
Release_3_21(revision: 1.1.2.20)
Bezugsverkettung_2  (revision: 1.21)
Bezuegsverkettung   (revision: 1.21)
Extented-Command2   (revision: 1.21)
Extended-Interpreter(revision: 1.21)
Citycarrier3(revision: 1.21)
Citycarrier2(revision: 1.21)
Citycarrier (revision: 1.21)
GnuPG_1 (revision: 1.21)
DOSBOX-Edition  (revision: 1.8)
before_FreeXP   (revision: 1.1.2.6)
Snapshot_31082003   (revision: 1.6)
Branch_3_20_Release (branch: 1.1.2)



FreeXP CVS-Mailingliste
CVS-List@freexp.de
http://www.freexp.de/cgi-bin/mailman/listinfo/cvs-list


CVS update: freexp

2006-04-16 Diskussionsfäden FreeXP CVS-Server

Date:   Sunday April 16, 2006 @ 17:07
Author: mw

Update of /server/cvs/freexp
In directory m25s18:/tmp/cvs-serv5020

Modified Files:
  Tag: Branch_3_40_Release
touch.pas 
Log Message:
MW: - Kleiner Fix (nicht für FreeXP relevant)


===
File: no file touch.pas Status: Needs Checkout

   Working revision:1.22.2.3Sun Apr 16 15:07:50 2006
   Repository revision: 1.22.2.3/server/cvs/freexp/touch.pas,v
   Sticky Tag:  Branch_3_40_Release (branch: 1.22.2)

   Existing Tags:
RC4_3_40_R2 (revision: 1.22)
RC4_3_40_R1 (revision: 1.22)
RC4_3_40_Fixes  (branch: 1.22.4)
Release_3_21_R1 (revision: 1.1.2.22)
RC4_3_40(revision: 1.22)
Branch_3_40_Release (branch: 1.22.2)
Release_3_21(revision: 1.1.2.20)
Bezugsverkettung_2  (revision: 1.21)
Bezuegsverkettung   (revision: 1.21)
Extented-Command2   (revision: 1.21)
Extended-Interpreter(revision: 1.21)
Citycarrier3(revision: 1.21)
Citycarrier2(revision: 1.21)
Citycarrier (revision: 1.21)
GnuPG_1 (revision: 1.21)
DOSBOX-Edition  (revision: 1.8)
before_FreeXP   (revision: 1.1.2.6)
Snapshot_31082003   (revision: 1.6)
Branch_3_20_Release (branch: 1.1.2)



FreeXP CVS-Mailingliste
CVS-List@freexp.de
http://www.freexp.de/cgi-bin/mailman/listinfo/cvs-list


CVS update: freexp

2006-04-16 Diskussionsfäden FreeXP CVS-Server

Date:   Sunday April 16, 2006 @ 17:08
Author: mw

Update of /server/cvs/freexp
In directory m25s18:/tmp/cvs-serv5163

Modified Files:
touch.pas 
Log Message:
MW: - Kleiner Fix (nicht für FreeXP relevant)

===
File: no file touch.pas Status: Needs Checkout

   Working revision:1.26Sun Apr 16 15:08:53 2006
   Repository revision: 1.26/server/cvs/freexp/touch.pas,v

   Existing Tags:
RC4_3_40_R2 (revision: 1.22)
RC4_3_40_R1 (revision: 1.22)
RC4_3_40_Fixes  (branch: 1.22.4)
Release_3_21_R1 (revision: 1.1.2.22)
RC4_3_40(revision: 1.22)
Branch_3_40_Release (branch: 1.22.2)
Release_3_21(revision: 1.1.2.20)
Bezugsverkettung_2  (revision: 1.21)
Bezuegsverkettung   (revision: 1.21)
Extented-Command2   (revision: 1.21)
Extended-Interpreter(revision: 1.21)
Citycarrier3(revision: 1.21)
Citycarrier2(revision: 1.21)
Citycarrier (revision: 1.21)
GnuPG_1 (revision: 1.21)
DOSBOX-Edition  (revision: 1.8)
before_FreeXP   (revision: 1.1.2.6)
Snapshot_31082003   (revision: 1.6)
Branch_3_20_Release (branch: 1.1.2)



FreeXP CVS-Mailingliste
CVS-List@freexp.de
http://www.freexp.de/cgi-bin/mailman/listinfo/cvs-list


CVS update: freexp

2006-04-16 Diskussionsfäden FreeXP CVS-Server

Date:   Sunday April 16, 2006 @ 17:44
Author: mw

Update of /server/cvs/freexp
In directory m25s18:/tmp/cvs-serv13137

Modified Files:
  Tag: Branch_3_40_Release
md5.pas 
Log Message:
MW: - Globales Abschalten der IO-Prüfung (I-)

===
File: no file md5.pas   Status: Needs Checkout

   Working revision:1.1.2.6 Sun Apr 16 15:44:47 2006
   Repository revision: 1.1.2.6 /server/cvs/freexp/md5.pas,v
   Sticky Tag:  Branch_3_40_Release (branch: 1.1.2)

   Existing Tags:
Branch_3_40_Release (branch: 1.1.2)



FreeXP CVS-Mailingliste
CVS-List@freexp.de
http://www.freexp.de/cgi-bin/mailman/listinfo/cvs-list


CVS update: freexp

2006-04-16 Diskussionsfäden FreeXP CVS-Server

Date:   Sunday April 16, 2006 @ 17:45
Author: mw

Update of /server/cvs/freexp
In directory m25s18:/tmp/cvs-serv15283

Modified Files:
md5.pas 
Log Message:
MW: - Globales Abschalten der Io-Prüfung (I-)


===
File: no file md5.pas   Status: Needs Checkout

   Working revision:1.7 Sun Apr 16 15:45:56 2006
   Repository revision: 1.7 /server/cvs/freexp/md5.pas,v

   Existing Tags:
Branch_3_40_Release (branch: 1.1.2)



FreeXP CVS-Mailingliste
CVS-List@freexp.de
http://www.freexp.de/cgi-bin/mailman/listinfo/cvs-list


CVS update: freexp

2006-04-16 Diskussionsfäden FreeXP CVS-Server

Date:   Sunday April 16, 2006 @ 18:13
Author: mw

Update of /server/cvs/freexp
In directory m25s18:/tmp/cvs-serv27443

Modified Files:
  Tag: Branch_3_40_Release
touch.pas 
Log Message:
MW: - Bugfix: Fehlerhafte Übergabe von Dateinamen an md5-Funktionen



===
File: no file touch.pas Status: Needs Checkout

   Working revision:1.22.2.4Sun Apr 16 16:13:33 2006
   Repository revision: 1.22.2.4/server/cvs/freexp/touch.pas,v
   Sticky Tag:  Branch_3_40_Release (branch: 1.22.2)

   Existing Tags:
RC4_3_40_R2 (revision: 1.22)
RC4_3_40_R1 (revision: 1.22)
RC4_3_40_Fixes  (branch: 1.22.4)
Release_3_21_R1 (revision: 1.1.2.22)
RC4_3_40(revision: 1.22)
Branch_3_40_Release (branch: 1.22.2)
Release_3_21(revision: 1.1.2.20)
Bezugsverkettung_2  (revision: 1.21)
Bezuegsverkettung   (revision: 1.21)
Extented-Command2   (revision: 1.21)
Extended-Interpreter(revision: 1.21)
Citycarrier3(revision: 1.21)
Citycarrier2(revision: 1.21)
Citycarrier (revision: 1.21)
GnuPG_1 (revision: 1.21)
DOSBOX-Edition  (revision: 1.8)
before_FreeXP   (revision: 1.1.2.6)
Snapshot_31082003   (revision: 1.6)
Branch_3_20_Release (branch: 1.1.2)



FreeXP CVS-Mailingliste
CVS-List@freexp.de
http://www.freexp.de/cgi-bin/mailman/listinfo/cvs-list


CVS update: freexp

2006-04-16 Diskussionsfäden FreeXP CVS-Server

Date:   Sunday April 16, 2006 @ 18:15
Author: mw

Update of /server/cvs/freexp
In directory m25s18:/tmp/cvs-serv28121

Modified Files:
touch.pas 
Log Message:
MW: - Bugfix: fehlerhafte Übergabe von Dateinamen an die md5-Funktionen


===
File: no file touch.pas Status: Needs Checkout

   Working revision:1.27Sun Apr 16 16:15:41 2006
   Repository revision: 1.27/server/cvs/freexp/touch.pas,v

   Existing Tags:
RC4_3_40_R2 (revision: 1.22)
RC4_3_40_R1 (revision: 1.22)
RC4_3_40_Fixes  (branch: 1.22.4)
Release_3_21_R1 (revision: 1.1.2.22)
RC4_3_40(revision: 1.22)
Branch_3_40_Release (branch: 1.22.2)
Release_3_21(revision: 1.1.2.20)
Bezugsverkettung_2  (revision: 1.21)
Bezuegsverkettung   (revision: 1.21)
Extented-Command2   (revision: 1.21)
Extended-Interpreter(revision: 1.21)
Citycarrier3(revision: 1.21)
Citycarrier2(revision: 1.21)
Citycarrier (revision: 1.21)
GnuPG_1 (revision: 1.21)
DOSBOX-Edition  (revision: 1.8)
before_FreeXP   (revision: 1.1.2.6)
Snapshot_31082003   (revision: 1.6)
Branch_3_20_Release (branch: 1.1.2)



FreeXP CVS-Mailingliste
CVS-List@freexp.de
http://www.freexp.de/cgi-bin/mailman/listinfo/cvs-list


CVS update: freexp/build/DOS16

2006-04-16 Diskussionsfäden FreeXP CVS-Server

Date:   Sunday April 16, 2006 @ 18:23
Author: mw

Update of /server/cvs/freexp/build/DOS16
In directory m25s18:/tmp/cvs-serv29281

Modified Files:
  Tag: Branch_3_40_Release
build.bat 
Log Message:
MW: - MD5-Summen in Binärachiven


===
File: no file build.bat Status: Needs Checkout

   Working revision:1.29.2.14   Sun Apr 16 16:23:38 2006
   Repository revision: 1.29.2.14   
/server/cvs/freexp/build/DOS16/build.bat,v
   Sticky Tag:  Branch_3_40_Release (branch: 1.29.2)

   Existing Tags:
RC4_3_40_R2 (revision: 1.29.2.2.2.2)
RC4_3_40_R1 (revision: 1.29.2.2.2.2)
RC4_3_40_Fixes  (branch: 1.29.2.2.2)
Release_3_21_R1 (revision: 1.1.2.21)
RC4_3_40(revision: 1.29.2.2)
Branch_3_40_Release (branch: 1.29.2)
Release_3_21(revision: 1.1.2.20)
Bezugsverkettung_2  (revision: 1.23)
Bezuegsverkettung   (revision: 1.23)
Extented-Command2   (revision: 1.23)
Extended-Interpreter(revision: 1.23)
Citycarrier3(revision: 1.22)
Citycarrier2(revision: 1.22)
Citycarrier (revision: 1.22)
GnuPG_1 (revision: 1.21)
DOSBOX-Edition  (revision: 1.11)
before_FreeXP   (revision: 1.1.2.8)
Snapshot_31082003   (revision: 1.7)
Branch_3_20_Release (branch: 1.1.2)



FreeXP CVS-Mailingliste
CVS-List@freexp.de
http://www.freexp.de/cgi-bin/mailman/listinfo/cvs-list


CVS daily diff

2006-04-16 Diskussionsfäden FreeXP CVS-Server
Index: freexp/md5.pas
===
RCS file: /server/cvs/freexp/md5.pas,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -r1.5 -r1.8
--- freexp/md5.pas  31 Mar 2006 10:41:18 -  1.5
+++ freexp/md5.pas  16 Apr 2006 16:15:09 -  1.8
@@ -1,6 +1,6 @@
-{ $Id: md5.pas,v 1.5 2006/03/31 10:41:18 mw Exp $ }
+{ $Id: md5.pas,v 1.8 2006/04/16 16:15:09 mw Exp $ }
 unit MD5;
-
+{$I-}
 {MD5 - 128 bit Hash function}
 
 
@@ -448,9 +448,15 @@
   reset(f,1);
   err:=IOResult;
   FileMode:=w;
-  if err0 then exit;
+  if err0 then begin
+Dispose(md5bufp);
+exit;
+  end;
   l:=FileSize(f);
-  if IOResult0 then exit;
+  if IOResult0 then begin
+ Dispose(md5bufp);
+ exit;
+  end;
   while (err=0) and (l0) do
   begin
 blockread(f,md5bufp^,SizeOf(md5buf),n);
@@ -460,7 +466,10 @@
   end;
   close(f);
   if IOResult=0 then;
-  if err0 then exit;
+  if err0 then begin
+Dispose(md5bufp);
+exit;
+  end;
   MD5Final(context,digest);
   Dispose(md5bufp);
   StrDigest:='';
@@ -942,6 +951,15 @@
 end.
 {
   $Log: md5.pas,v $
+  Revision 1.8  2006/04/16 16:15:09  mw
+  MW: - Memory-Leak beseitigt.
+
+  Revision 1.7  2006/04/16 15:45:56  mw
+  MW: - Globales Abschalten der Io-Prüfung (I-)
+
+  Revision 1.6  2006/04/16 14:13:04  mw
+  MW: - IO-Fehler beseitigt.
+
   Revision 1.5  2006/03/31 10:41:18  mw
   MW: - Copyright ergänzt (wir haben diese Datei modifiziert!!!)
 
Index: freexp/touch.pas
===
RCS file: /server/cvs/freexp/touch.pas,v
retrieving revision 1.24
retrieving revision 1.27
diff -u -r1.24 -r1.27
--- freexp/touch.pas2 Jan 2006 09:46:11 -   1.24
+++ freexp/touch.pas16 Apr 2006 16:15:41 -  1.27
@@ -9,25 +9,26 @@
 { finden Sie in der Datei TOUCH.TXT oder auf  }
 { http://www.martinwodrich.de/Software/Touch/nutzung.htm  }
 { --- }
-{ $Id: touch.pas,v 1.24 2006/01/02 09:46:11 mw Exp $ }
+{ $Id: touch.pas,v 1.27 2006/04/16 16:15:41 mw Exp $ }
+{$IFDEF MSDOS}{$M 32768,131072,655360}{$ENDIF}
 program touch;
 {$I TOUCH.INC }
 
 { Betriebsystemabhaeniges }
 {$IFNDEF WINDOWS }
 {$IFDEF VPOS2}
-uses use32,dos,crt;
+uses use32,dos,crt,md5,fileio;
 {$ELSE }
-uses dos,crt{$IFDEF BPLFN},touchlfn{$ENDIF};
+uses dos,crt{$IFDEF BPLFN},touchlfn{$ENDIF},md5,fileio;
 {$ENDIF }
 {$ELSE }
-uses windos,wincrt,strings;
+uses windos,wincrt,strings,md5,fileio;
 {$ENDIF }
 
 const anyfile=$21;
   {$IFNDEF DPMI}
   {$IFNDEF unix}
-  beta='.3';  {Patchlevel 1}
+  beta='.3fxp1';  {Patchlevel 3}
   {$ELSE}
   !!! Touch 1.2 lΣuft nicht auf unixartigen Betriebsystemen !!
   beta=' Alpha 7';
@@ -90,6 +91,7 @@
 
 var f:file;
 g:text;
+md5f:text;
 {$IFDEF WINDOWS }
dt  : TDateTime;
DirInfo : TSearchRec;
@@ -117,6 +119,7 @@
ref : boolean;
s,u : string[100];
sim,zcout   : boolean;
+   md5b: boolean;
files   : byte;
st,n: macrop;
dateSet,timeSet : boolean;
@@ -213,6 +216,7 @@
 writeln (' '+Paramark+'J=Jobfile Dateiliste verwenden, statt lange 
Argumentliste'+CR);
 writeln (' '+Paramark+'ZCNeue Dateien als ZConnect-PUFFER 
erstellen'+CR);
 writeln (' '+Paramark+'I Interaktiver Modus (Lesen der 
Dateiinfos von Standard-Input)'+CR);
+writeln (' '+Paramark+'MD5   Pruefsummendatei md5sums mit 
MD5-Summen erstellen'+CR);
 end;
 
 procedure isok(meldung:integer);
@@ -442,6 +446,7 @@
   {$IFDEF WINDOWS}
   nc:=false;
   {$ENDIF}
+  md5b:=false;
 end;
 
 {$IFDEF BPLFN}
@@ -553,6 +558,7 @@
   if (copy(s,1,1)=Paramark) then begin
s[2]:=UpCase(s[2]);
s[3]:=UpCase(s[3]);
+   s[4]:=UpCase(s[4]);
{Parameter gefunden}
if (copy(s,2,2)='T=') then begin
  {Uhrzeit lesen}
@@ -657,6 +663,16 @@
   Readln(s);
 end;
end;
+   if (copy(s,2,3)='MD5') then begin
+ {MD5-Summen einschalten}
+ md5b:=true;
+ {$IFDEF unix}
+ assign(md5f,'md5sums');
+ {$ELSE}
+ assign(md5f,'MD5SUMS');
+ {$ENDIF}
+ if existf(md5f) then append(md5f) else rewrite(md5f);
+   end;
   end
   else newmacro;
 end;
@@ -728,6 +744,9 @@
else fname:=Dir+fname;
if fnameown then begin
  write(fname);
+ if md5b then begin
+   writeln(md5f,md5sum_file(fname)+' *'+fname); 
+ end;
  {Refdatei nicht touchen}
  if ref and testname(reffile,fname) then writeln(' Referenz'+CR)
  else begin
@@ -811,9 +830,19 @@
   if nc then Readln;
   DoneWinCrt;
   {$ENDIF}
+  if md5b then close(md5f);
 end.
 {
   $Log: touch.pas,v $
+  Revision 1.27  2006/04/16 16:15:41  mw
+  MW: - Bugfix: fehlerhafte Übergabe von Dateinamen an die md5-Funktionen
+