[Bitcollider-commits] CVS: bitcollider/lib main.c,1.43,1.44

[Mike L. <mli...@us...>]

Update of /cvsroot/bitcollider/bitcollider/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv15806/lib

Modified Files:
	main.c 
Log Message:
http://sourceforge.net/tracker/index.php?func=detail&aid=610360&group_id=21211&atid=371211
http://sourceforge.net/tracker/index.php?func=detail&aid=481033&group_id=21211&atid=121211
http://sourceforge.net/tracker/index.php?func=detail&aid=491787&group_id=21211&atid=121211


Index: main.c
===================================================================
RCS file: /cvsroot/bitcollider/bitcollider/lib/main.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** main.c	14 Mar 2003 05:26:42 -0000	1.43
--- main.c	25 Oct 2003 23:43:33 -0000	1.44
***************
*** 377,381 ****
      add_attribute(submission, "tag.file.first20", firstNHex);
      add_attribute(submission, "tag.filename.filename", baseFileName);
!     // add_attribute(submission, "tag.md5.md5", md5);
      add_attribute(submission, "tag.ed2k.ed2khash", ed2kmd4);
  	add_attribute(submission, "tag.uuhash.uuhash", ftuu);
--- 377,384 ----
      add_attribute(submission, "tag.file.first20", firstNHex);
      add_attribute(submission, "tag.filename.filename", baseFileName);
!     if (submission->bc->calculateMD5)
!     {
!         add_attribute(submission, "tag.md5.md5", md5);
!     }
      add_attribute(submission, "tag.ed2k.ed2khash", ed2kmd4);
  	add_attribute(submission, "tag.uuhash.uuhash", ftuu);
***************
*** 511,514 ****
--- 514,522 ----
  }
  
+ void set_calculateMD5(Bitcollider *bc, b_bool calculateMD5)
+ {
+     bc->calculateMD5 = calculateMD5;
+ }
+ 
  void set_exit(Bitcollider *bc, b_bool exitNow)
  {
***************
*** 732,736 ****
  {
      BP_CONTEXT         bcontext;
! //  struct MD5Context  md5context;
  	ED2K_CTX           ed2kmd4context;
  	FTUU_CTX           ftuucontext;
--- 740,744 ----
  {
      BP_CONTEXT         bcontext;
!     struct MD5Context  md5context;
  	ED2K_CTX           ed2kmd4context;
  	FTUU_CTX           ftuucontext;
***************
*** 750,756 ****
      if (methods && methods->mem_analyze_init)
         context = methods->mem_analyze_init();
!     // MD5Init(&md5context);
! 	ED2KInit(&ed2kmd4context);
! 	FTUUInit(&ftuucontext);
  
      buffer = (unsigned char*)malloc(BUFFER_LEN);
--- 758,765 ----
      if (methods && methods->mem_analyze_init)
         context = methods->mem_analyze_init();
!     if (submission->bc->calculateMD5)
!         MD5Init(&md5context);
!     ED2KInit(&ed2kmd4context);
!     FTUUInit(&ftuucontext);
  
      buffer = (unsigned char*)malloc(BUFFER_LEN);
***************
*** 783,789 ****
          if (methods && methods->mem_analyze_update)
             methods->mem_analyze_update(context, buffer, bytes);
!         // MD5Update(&md5context, buffer, bytes);
! 		ED2KUpdate(&ed2kmd4context, buffer, bytes);
! 		FTUUUpdate(&ftuucontext, buffer, bytes);
  
          if (submission->bc->progressCallback && !submission->bc->preview)
--- 792,799 ----
          if (methods && methods->mem_analyze_update)
             methods->mem_analyze_update(context, buffer, bytes);
!         if (submission->bc->calculateMD5)
!             MD5Update(&md5context, buffer, bytes);
! 	ED2KUpdate(&ed2kmd4context, buffer, bytes);
! 	FTUUUpdate(&ftuucontext, buffer, bytes);
  
          if (submission->bc->progressCallback && !submission->bc->preview)
***************
*** 812,820 ****
          *attrList = methods->mem_analyze_final(context);
  
!     // MD5Final(md5Digest, &md5context);
! 	ED2KFinal(ed2kDigest, &ed2kmd4context);
! 	FTUUFinal(ftuuDigest, &ftuucontext);
  
-     bitziEncodeBase32(md5Digest, 16, md5sum);
      sprintf(ed2kmd4sum,"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
  		    ed2kDigest[0],ed2kDigest[1],ed2kDigest[2],ed2kDigest[3],
--- 822,834 ----
          *attrList = methods->mem_analyze_final(context);
  
!     if (submission->bc->calculateMD5)
!     {
!         MD5Final(md5Digest, &md5context);
!         bitziEncodeBase32(md5Digest, 16, md5sum);
!     }
! 
!     ED2KFinal(ed2kDigest, &ed2kmd4context);
!     FTUUFinal(ftuuDigest, &ftuucontext);
  
      sprintf(ed2kmd4sum,"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
  		    ed2kDigest[0],ed2kDigest[1],ed2kDigest[2],ed2kDigest[3],