Changeset 61 for trunk/src

Timestamp:

Sep 11, 2006, 10:31:56 PM (18 years ago)

Author:

rainer

Message:

Fix for MacOX X problems and Cygwin compile problem, resolves tickets #33, #34, #35.

Location:

trunk/src

Files:

• sh_files.c (modified) (2 diffs)
• sh_suidchk.c (modified) (2 diffs)

trunk/src/sh_files.c

@@ -721 +721 @@
 
   SL_ENTER(_("sh_files_globerr"));
+
+  if (errnum == ENOTDIR || errnum == ENOENT)
+    {
+      SL_RETURN(0, _("sh_files_globerr"));
+    }
 
   p = sh_util_safe_name (epath);
@@ -2068 +2073 @@
       if (sl_strlen(testpath) == (17 + sl_strlen(fullpath)))
         {
-          if (0 == sh_unix_file_stat (testpath))
+          if (0 != sh_unix_file_stat (testpath))
             {
               sh_files_filecheck (class, fullpath, rsrc, &dummy, 1);

trunk/src/sh_suidchk.c

@@ -521 +521 @@
                0 != strcmp(tmpcat, ShSuidchkExclude)))
             {
-              /* fs is a STATIC string
+              /* fs is a STATIC string or NULL
                */
               fs = filesystem_type (tmpcat, tmpcat, &buf);
@@ -1771 +1771 @@
           /* check for the "nosuid" option
            */
+#ifdef HAVE_HASMNTOPT
           if (NULL == hasmntopt(mnt, "nosuid"))
             type = mnt->mnt_type;
           else
-            type = _("nosuid");
+            type = _("nosuid"); /* hasmntopt (nosuid) */
+#else
+          type = mnt->mnt_type;
+#endif
         }
     }