Changeset 317 for trunk/src/sh_calls.c

Timestamp:

Mar 15, 2011, 8:54:21 PM (14 years ago)

Author:

katerina

Message:

Further refinements for lstat in subprocess (ticket #236).

File:

• trunk/src/sh_calls.c (modified) (3 diffs)

trunk/src/sh_calls.c

@@ -242 +242 @@
 }
 
+static int sh_enable_use_sub = 0;
+
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
+static int sh_use_sub = 1;
+#else
 static int sh_use_sub = 0;
+#endif
+
+void sh_calls_enable_sub()
+{
+  sh_enable_use_sub = 1;
+  return;
+}
 
 int sh_calls_set_sub (const char * str)
 {
-  return sh_util_flagval(str, &sh_use_sub);
+  int ret = sh_util_flagval(str, &sh_use_sub);
+
+  if ((ret == 0) && (!sh_use_sub))
+    {
+      sh_kill_sub();
+    }
+  return ret;
+}
+
+long int retry_lstat_ns(const char * file, int line, 
+                        const char *file_name, struct stat *buf)
+{
+  int error;
+  long int val_retry = -1;
+  char errbuf[SH_ERRBUF_SIZE];
+ 
+  SL_ENTER(_("retry_lstat_ns"));
+
+  do {
+    val_retry = /*@-unrecog@*/lstat (file_name, buf)/*@+unrecog@*/;
+  } while (val_retry < 0 && errno == EINTR);
+
+  error = errno;
+  if (val_retry < 0) {
+      (void) sh_error_message(error, aud_err_message, 64);
+      sh_error_handle ((-1), file, line, error, MSG_ERR_LSTAT, 
+                       sh_error_message(error, errbuf, sizeof(errbuf)),
+                       file_name );
+  }
+  errno = error;    
+
+  SL_RETURN(val_retry, _("retry_lstat_ns"));
 }
 
@@ -258 +301 @@
   SL_ENTER(_("retry_lstat"));
 
-  if (sh_use_sub)
+  if (sh_use_sub && sh_enable_use_sub)
     {
       val_retry = sh_sub_lstat (file_name, buf);
@@ -290 +333 @@
   SL_ENTER(_("retry_stat"));
 
-  if (sh_use_sub)
+  if (sh_use_sub && sh_enable_use_sub)
     {
       val_retry = sh_sub_stat (file_name, buf);