Changeset 144 for trunk/src/sh_processcheck.c

Timestamp:

Oct 31, 2007, 11:33:13 PM (17 years ago)

Author:

rainer

Message:

Fix some more queer compile problems.

File:

• trunk/src/sh_processcheck.c (modified) (5 diffs)

trunk/src/sh_processcheck.c

@@ -689 +689 @@
   struct stat buf;
   DIR * dir;
+  int  retval;
 #ifdef HAVE_STATVFS
-  int  retval;
   struct statvfs vfsbuf;
 #endif
@@ -753 +753 @@
   sl_snprintf (path, sizeof(path), "/proc/%ld", (unsigned long) pid);
 
-  if (0 == retry_lstat (FIL__, __LINE__, path, &buf))
+  do {
+    retval = lstat (path, &buf);
+  } while (retval < 0 && errno == EINTR);
+
+  if (0 == retval)
     { 
       res |= SH_PR_LSTAT;   res |= SH_PR_ANY; ++have_checks;
@@ -782 +786 @@
     {
       res |= SH_PR_CHDIR;   res |= SH_PR_ANY; ++have_checks;
-      retry_aud_chdir(FIL__, __LINE__, "/");
+      do {
+        retval = chdir ("/");
+      } while (retval < 0 && errno == EINTR);
     }
   ++need_checks;
@@ -1215 +1221 @@
     return SH_MOD_FAILED;
 #ifdef HAVE_PTHREAD
-  if (arg != NULL && arg->initval < 0 && sh.flag.isdaemon == S_TRUE)
+  if (arg != NULL && arg->initval < 0 &&
+      (sh.flag.isdaemon == S_TRUE || sh.flag.loop == S_TRUE))
     {
       if (0 == sh_pthread_create(sh_threaded_module_run, (void *)arg))
@@ -1307 +1314 @@
   userdef_maxpid     = 0;
   sh_prochk_maxpid   = 0x8000;
-  sh_prochk_minpid   = 0x0000;
+  sh_prochk_minpid   = 0x0001;
   sh_prochk_interval = SH_PROCHK_INTERVAL;