Changeset 78 for trunk/src/sh_unix.c

Timestamp:

Jan 9, 2007, 10:32:21 PM (18 years ago)

Author:

rainer

Message:

Fix for ticket #41 (unable to deactivate processcheck), and minor code cleanup.

File:

• trunk/src/sh_unix.c (modified) (1 diff)

trunk/src/sh_unix.c

@@ -3833 +3833 @@
 /* Test whether file exists
  */
-int sh_unix_file_stat(char * path)
+int sh_unix_file_exists(char * path)
 {
   struct stat buf;
 
-  SL_ENTER(_("sh_unix_file_stat"));
+  SL_ENTER(_("sh_unix_file_exists"));
 
   if (-1 == retry_stat(FIL__, __LINE__, path, &buf))
-    SL_RETURN(  (0), _("sh_unix_file_stat"));
+    SL_RETURN( S_FALSE, _("sh_unix_file_exists"));
   else 
-    SL_RETURN( (-1), _("sh_unix_file_stat"));
-}
-
-
-/* Test whether file exists, is a character device, allows read
- * access, and is not world writeable.
+    SL_RETURN( S_TRUE,  _("sh_unix_file_exists"));
+}
+
+
+/* Test whether file exists, is a character device, and allows read
+ * access.
  */
-int sh_unix_file_exists(int fd)
+int sh_unix_device_readable(int fd)
 {
   struct stat buf;
 
-  SL_ENTER(_("sh_unix_file_exists"));
+  SL_ENTER(_("sh_unix_device_readable"));
 
   if (retry_fstat(FIL__, __LINE__, fd, &buf) == -1)
-    SL_RETURN( (-1), _("sh_unix_file_exists"));
-  else if ( S_ISCHR(buf.st_mode) &&  0 != (S_IROTH & buf.st_mode)
-            /*
-             * #if !defined(__CYGWIN32__) && !defined(__CYGWIN__) 
-             * && 0 == (S_IWOTH & buf.st_mode)
-             * #endif
-             */
-            ) 
-    SL_RETURN( (0), _("sh_unix_file_exists"));
+    SL_RETURN( (-1), _("sh_unix_device_readable"));
+  else if ( S_ISCHR(buf.st_mode) &&  0 != (S_IROTH & buf.st_mode) ) 
+    SL_RETURN( (0), _("sh_unix_device_readable"));
   else 
-    SL_RETURN( (-1), _("sh_unix_file_exists"));
+    SL_RETURN( (-1), _("sh_unix_device_readable"));
 }