Changeset 131 for trunk/src/sh_files.c

Timestamp:

Oct 22, 2007, 11:19:15 PM (17 years ago)

Author:

rainer

Message:

Use thread-safe libc functions.

File:

• trunk/src/sh_files.c (modified) (9 diffs)

trunk/src/sh_files.c

@@ -60 +60 @@
 #if (defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)) 
 
+#include "sh_pthread.h"
 #include "sh_error.h"
 #include "sh_utils.h"
@@ -191 +192 @@
   SL_RETURN((0), _("sh_files_setrecursion"));
 }
-
 
 unsigned long sh_files_chk ()
@@ -1340 +1340 @@
 }
 
+/**
 struct sh_dirent {
-  /* char               sh_d_name[NAME_MAX + 2]; */
   char             * sh_d_name;
   struct sh_dirent * next;
 };
-
-static void kill_sh_dirlist (struct sh_dirent * dirlist)
+**/
+
+void kill_sh_dirlist (struct sh_dirent * dirlist)
 {
   struct sh_dirent * this;
@@ -1362 +1363 @@
 /* -- add an entry to a directory listing
  */
-static struct sh_dirent * addto_sh_dirlist (struct dirent * thisEntry, 
-                                            struct sh_dirent * dirlist)
+struct sh_dirent * addto_sh_dirlist (struct dirent * thisEntry, 
+                                     struct sh_dirent * dirlist)
 {
   struct sh_dirent * this;
@@ -1485 +1486 @@
   dir_type        theDir;
   ShFileType      checkit;
-
+  static unsigned int state = 1;
 
   file_type       theFile;
@@ -1633 +1634 @@
   /* ---- read ----
    */
+  SH_MUTEX_LOCK(readdir_lock);
+
   do {
       thisEntry = readdir (thisDir);
@@ -1652 +1655 @@
   } while (thisEntry != NULL);
 
+  SH_MUTEX_UNLOCK(readdir_lock);
+
   closedir (thisDir);
 
@@ -1672 +1677 @@
 
     BREAKEXIT(sh_derr);
-    if (0 == (rand() % 5))
-      (void) sh_derr();
+
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_RAND_R)
+    if (0 == (rand_r(&state) % 5)) (void) sh_derr();
+#else
+    if (0 == state * (rand() % 5)) (void) sh_derr();
+#endif
     
     /* ---- Check the file. ---- 
@@ -1929 +1938 @@
   char          * fileName;
   struct utimbuf  utime_buf;
+  static unsigned int state = 1;
 
   SL_ENTER(_("sh_files_filecheck"));
 
   BREAKEXIT(sh_derr);
-  if (0 == (rand() % 2))
-    (void) sh_derr();
+
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_RAND_R)
+  if (0 == (rand_r(&state) % 2)) (void) sh_derr();
+#else
+  if (0 == state * (rand() % 2)) (void) sh_derr();
+#endif
 
   if (dirName && infileName && (dirName[0] == '/') && (dirName[1] == '\0')