Changeset 133 for trunk/src/sh_unix.c

Timestamp:

Oct 25, 2007, 12:19:05 AM (17 years ago)

Author:

rainer

Message:

Reentrant checksum/hash functions.

File:

• trunk/src/sh_unix.c (modified) (14 diffs)

trunk/src/sh_unix.c

@@ -883 +883 @@
 {
   char message[512];
+  char hashbuf[KEYBUF_SIZE];
 
   SL_ENTER(_("sh_unix_self_hash"));
@@ -894 +895 @@
 
   sl_strlcpy(sh.exec.hash,
-             sh_tiger_hash (c, TIGER_FILE, 0), 
+             sh_tiger_hash (c, TIGER_FILE, 0, hashbuf, sizeof(hashbuf)), 
              KEY_LEN+1);
   sl_snprintf(message, 512, _("%s has checksum: %s"),
@@ -917 +918 @@
   char newhash[KEY_LEN+1];
   char message[512];
+  char hashbuf[KEYBUF_SIZE];
 
   SL_ENTER(_("sh_unix_self_check"));
@@ -922 +924 @@
     SL_RETURN((0), _("sh_unix_self_check"));
 
-  sl_strlcpy(newhash, sh_tiger_hash (sh.exec.path, TIGER_FILE, 0), KEY_LEN+1);
+  sl_strlcpy(newhash, 
+             sh_tiger_hash (sh.exec.path, TIGER_FILE, 0, hashbuf, sizeof(hashbuf)), 
+             KEY_LEN+1);
   if (0 == sl_strncmp(sh.exec.hash, 
                       newhash,
@@ -2357 +2361 @@
 }
 
-SH_MUTEX_STATIC(getUIDname, PTHREAD_MUTEX_INITIALIZER);
+SH_MUTEX_STATIC(mutex_getUIDname, PTHREAD_MUTEX_INITIALIZER);
 
 char *  sh_unix_getUIDname (int level, uid_t uid, char * out, size_t len)
@@ -2375 +2379 @@
   if ((uid == old_uid) && (name[0] != '\0')) {
     out[0] = '\0';
-    SH_MUTEX_LOCK_UNSAFE(getUIDname);
+    SH_MUTEX_LOCK_UNSAFE(mutex_getUIDname);
     if ((uid == old_uid) && (name[0] != '\0')) {
       sl_strlcpy(out, name, len);
     }
-    SH_MUTEX_UNLOCK_UNSAFE(getUIDname);
+    SH_MUTEX_UNLOCK_UNSAFE(mutex_getUIDname);
     if (out[0] != '\0')
       SL_RETURN( out, _("sh_unix_getUIDname"));
@@ -2401 +2405 @@
 
   if (tempres->pw_name != NULL) {
-    SH_MUTEX_LOCK_UNSAFE(getUIDname);
+    SH_MUTEX_LOCK_UNSAFE(mutex_getUIDname);
     sl_strlcpy(name, tempres->pw_name, sizeof(name));
     old_uid = uid;
     sl_strlcpy(out, name, len);
-    SH_MUTEX_UNLOCK_UNSAFE(getUIDname);
+    SH_MUTEX_UNLOCK_UNSAFE(mutex_getUIDname);
     SL_RETURN( out, _("sh_unix_getUIDname"));
   } else {
@@ -2415 +2419 @@
 }
 
-SH_MUTEX_STATIC(getGIDname, PTHREAD_MUTEX_INITIALIZER);
+SH_MUTEX_STATIC(mutex_getGIDname, PTHREAD_MUTEX_INITIALIZER);
 
 char *  sh_unix_getGIDname (int level, gid_t gid, char * out, size_t len)
@@ -2434 +2438 @@
   if ((gid == old_gid) && (name[0] != '\0')) {
     out[0] = '\0';
-    SH_MUTEX_LOCK_UNSAFE(getGIDname);
+    SH_MUTEX_LOCK_UNSAFE(mutex_getGIDname);
     if ((gid == old_gid) && (name[0] != '\0')) {
       sl_strlcpy(out, name, len);
     }
-    SH_MUTEX_UNLOCK_UNSAFE(getGIDname);
+    SH_MUTEX_UNLOCK_UNSAFE(mutex_getGIDname);
     if (out[0] != '\0')
       SL_RETURN( out, _("sh_unix_getGIDname"));
@@ -2459 +2463 @@
   }
 
-  /* FIXME: need to return caller-supplied buffer */
   if (tempres->gr_name != NULL) {
-    SH_MUTEX_LOCK_UNSAFE(getGIDname);
+    SH_MUTEX_LOCK_UNSAFE(mutex_getGIDname);
     sl_strlcpy(name, tempres->gr_name, sizeof(name));
     old_gid = gid;
     sl_strlcpy(out, name, len);
-    SH_MUTEX_UNLOCK_UNSAFE(getGIDname);
+    SH_MUTEX_UNLOCK_UNSAFE(mutex_getGIDname);
     SL_RETURN( out, _("sh_unix_getGIDname"));
   } else {
@@ -2993 +2996 @@
 
 int sh_unix_checksum_size (char * filename, struct stat * fbuf, 
-                           char * fileHash, int alert_timeout)
+                           char * fileHash, int alert_timeout, SL_TICKET fd)
 {
   file_type tmpFile;
@@ -3016 +3019 @@
   if (tmpFile.size < fbuf->st_size)
     {
+      char hashbuf[KEYBUF_SIZE];
       sl_strlcpy(fileHash,
-                 sh_tiger_generic_hash (filename, TIGER_FD, tmpFile.size, 
-                                        alert_timeout),
+                 sh_tiger_generic_hash (filename, fd, tmpFile.size, 
+                                        alert_timeout, hashbuf, sizeof(hashbuf)),
                  KEY_LEN+1);
       
@@ -3355 +3359 @@
           else
             {
-              tiger_fd = rval_open;
+              char hashbuf[KEYBUF_SIZE];
               sl_strlcpy(fileHash,
                          sh_tiger_generic_hash (theFile->fullpath, 
-                                                TIGER_FD, TIGER_NOLIM, 
-                                                alert_timeout),
+                                                rval_open, TIGER_NOLIM, 
+                                                alert_timeout, 
+                                                hashbuf, sizeof(hashbuf)),
                          KEY_LEN+1);
               if ((theFile->check_mask & MODI_SGROW) != 0)
                 {
                   sl_rewind(rval_open);
-                  tiger_fd = rval_open;
                   sh_unix_checksum_size (theFile->fullpath, &fbuf, 
                                          &fileHash[KEY_LEN + 1], 
-                                         alert_timeout);
+                                         alert_timeout, rval_open);
                 }
             }
@@ -3395 +3399 @@
           else
             {
-              tiger_fd = rval_open;
+              char hashbuf[KEYBUF_SIZE];
               sl_strlcpy(fileHash, 
-                         sh_tiger_generic_hash (theFile->fullpath, TIGER_FD, TIGER_NOLIM,
-                                                alert_timeout),
+                         sh_tiger_generic_hash (theFile->fullpath, rval_open, 
+                                                TIGER_NOLIM,
+                                                alert_timeout,
+                                                hashbuf, sizeof(hashbuf)),
                          KEY_LEN + 1);
               if ((theFile->check_mask & MODI_SGROW) != 0) 
                 {
                   sl_rewind(rval_open);
-                  tiger_fd = rval_open;
                   sh_unix_checksum_size (theFile->fullpath, &fbuf, 
                                          &fileHash[KEY_LEN + 1], 
-                                         alert_timeout);
+                                         alert_timeout, rval_open);
                 }
             }