Changeset 742 in Sophya

Timestamp:

Feb 26, 2000, 10:24:54 AM (26 years ago)

Author:

ansari

Message:

new md5

Location:

trunk

Files:

• SophyaLib/BaseTools/gnumd5.c (added)
• SophyaLib/BaseTools/gnumd5.h (added)
• SophyaLib/BaseTools/md5.c (deleted)
• SophyaLib/BaseTools/md5.h (deleted)
• SophyaLib/BaseTools/peidainit.cc (modified) (2 diffs)
• SophyaLib/BaseTools/ppersist.cc (modified) (3 diffs)
• SophyaLib/BaseTools/ppersist.h (modified) (2 diffs)
• SophyaLib/Mgr/mkmf (modified) (1 diff)
• SophyaProg/Tests/Makefile (modified) (1 diff)
• SophyaProg/Tests/scanppf.cc (modified) (1 diff)
• SophyaProg/Tests/tobjio.cc (modified) (1 diff)

trunk/SophyaLib/BaseTools/peidainit.cc

@@ -70 +70 @@
 {
 if (fgprt) {
-  char* compiler;
+  char* compiler = 0;
   #ifdef __GNUG__
   compiler = "gcc " __VERSION__;
@@ -86 +86 @@
   compiler = const_cast<char *>("SGI-CC ") ;
   #endif
+  #ifdef __MWERKS__
+  compiler = const_cast<char *>("Codewarrior ");
+  #endif
   fprintf(stderr,"SOPHYA Version %4.1f Revision %d (%s) -- %s %s %s\n",
           SOPHYA_VERSION, SOPHYA_REVISION, SOPHYA_TAG,

trunk/SophyaLib/BaseTools/ppersist.cc

@@ -35 +35 @@
 
 
-MD5_CTX PIOPersist::ctx;
+MD5_CONTEXT PIOPersist::ctx;
 PIOPersist::ClassList * PIOPersist::classList = NULL;   // $CHECK$ Reza 26/04/99
 map<string, uint_8> * PIOPersist::typeids = NULL;
@@ -250 +250 @@
   rbuf[32] = '\0'; 
   struct tm tm;
-  strptime(rbuf,"%d/%m/%Y %T GMT",&tm);
+  #ifndef __MWERKS__
+  strptime(rbuf,"%d/%m/%Y %H:%M:%S GMT",&tm);
+  #else
+  sscanf(rbuf,"%2d/%2d/%4d %2d:%2d:%2d GMT",&tm.tm_mday,&tm.tm_mon,&tm.tm_year,
+                                            &tm.tm_hour,&tm.tm_min,&tm.tm_sec);
+  tm.tm_mon  --;
+  tm.tm_year -= 1900;
+  #endif
   creationdate = mktime(&tm);
 
@@ -809 +816 @@
   time_t tm = time(NULL);
   char datestring[33];
-  int l=strftime(datestring,32,"%d/%m/%Y %T GMT",gmtime(&tm));
+  int l=strftime(datestring,32,"%d/%m/%Y %H:%M:%S GMT",gmtime(&tm));
   for(int i=l; i<32; i++)  datestring[i] = ' ';
   datestring[32] = '\0'; 

trunk/SophyaLib/BaseTools/ppersist.h

@@ -11 +11 @@
 #include "machdefs.h"
 #include "pexceptions.h"
-#include "md5.h"
+#include "gnumd5.h"
+
 
 #include <time.h>
@@ -72 +73 @@
     static ClassCreatorFunc      FindCreatorFunc(uint_8 classId);
     static uint_8 Hash(string const& typname) {
-        MD5Init(&ctx);
-        MD5Update(&ctx, (unsigned char*) typname.c_str(), typname.size());
-        MD5Final(&ctx);
-        return ( *((uint_8*) ctx.digest) + *((uint_8*) (ctx.digest+8)));
+        md5_init(&ctx);
+        md5_write(&ctx, (unsigned char*) typname.c_str(), typname.size());
+        md5_final(&ctx);
+        return ( *((uint_8*) ctx.buf) + *((uint_8*) (ctx.buf+8)));
     }
-    static MD5_CTX ctx;
+    static MD5_CONTEXT ctx;
   
     static void Initialize();   // Pour initialiser classList

trunk/SophyaLib/Mgr/mkmf

@@ -1 +1 @@
 #!/bin/csh 
-# $Id: mkmf,v 1.8 2000-02-25 18:34:48 ansari Exp $
+# $Id: mkmf,v 1.9 2000-02-26 09:24:52 ansari Exp $
 
 #  Pour debugger 
 set DODBG = 'echo'
+set DODBG = ''
 
 # Librairies externe

trunk/SophyaProg/Tests/Makefile

@@ -13 +13 @@
 endif
 else
-LIBF =  $(SLB)libtools.so 
-#LIBS = -L$(SLB) -lPI -ltools -lm 
-LIBS = -L$(SLB) -ltools -lm 
+LIBF =  $(SLB)libsophya.so 
+#LIBS = -L$(SLB) -lPI -lsophya -lm 
+LIBS = -L$(SLB) -lsophya -lm 
 ifeq ($(MACHEROS),Linux)
 LIBS := $(LIBS) -ldl

trunk/SophyaProg/Tests/scanppf.cc

@@ -9 +9 @@
 #include "sambainit.h"
 
+#ifdef __MWERKS__
+#include <console.h>
+#endif
+
 int main(int narg, char* arg[])
 {
+
+#ifdef __MWERKS__
+narg = ccommand(&arg);
+#endif
+
 SambaInitiator smbinit;
 

trunk/SophyaProg/Tests/tobjio.cc

@@ -22 +22 @@
 
   PeidaInit();
+
+  cout << "Hash check, OMatrix : " << hex << PIOPersist::Hash("OMatrix") << dec << endl;
 
   cout << "Test Creation / PPersist Save NTuple, Histo, ..." << endl;