Changeset 221 for trunk

Timestamp:

Feb 25, 2009, 8:38:28 PM (16 years ago)

Author:

katerina

Message:

Fix MacOS X problems (ticket #148).

Location:

trunk

Files:

• configure.ac (modified) (11 diffs)
• docs/Changelog (modified) (1 diff)
• src/sh_unix.c (modified) (1 diff)
• src/trustfile.c (modified) (1 diff)

trunk/configure.ac

@@ -59 +59 @@
         AC_DEFINE(HOST_IS_LINUX)
         AC_DEFINE(HAVE_EXT2_IOCTLS)
-        AC_MSG_RESULT(use ioctl to get e2fs flags)
+        AC_MSG_RESULT([use ioctl to get e2fs flags])
         case "$host_cpu" in 
            i*86*)
@@ -75 +75 @@
           CFLAGS="$CFLAGS -O2 -assume noaligned_objects"
           myneedg3=yes
-          AC_MSG_RESULT(compiler needs assume noaligned_objects)
+          AC_MSG_RESULT([compiler needs assume noaligned_objects])
         else
-          AC_MSG_RESULT(none)
+          AC_MSG_RESULT([none])
         fi
         ;;
@@ -84 +84 @@
         AC_DEFINE(HOST_IS_CYGWIN)
         dnmalloc_ok=no
-        AC_MSG_RESULT(no trusted paths and no dnmalloc)
+        AC_MSG_RESULT([no trusted paths and no dnmalloc])
         ;;
 
         *darwin*) 
         AC_DEFINE(HOST_IS_DARWIN)
-        AC_MSG_RESULT(check resource forks)
+        dnmalloc_ok=no
+        AC_MSG_RESULT([check resource forks, no dnmalloc])
         ;;
 
@@ -102 +103 @@
                 ;;
                 *)
-                AC_MSG_RESULT(none)
+                AC_MSG_RESULT([none])
                 ;;
         esac
@@ -110 +111 @@
         AC_DEFINE(HOST_IS_FREEBSD)
         selectconfig=freebsd
-        AC_MSG_RESULT(none)
+        AC_MSG_RESULT([none])
         ;;
         
@@ -117 +118 @@
         selectconfig=freebsd
         dnmalloc_ok=no
-        AC_MSG_RESULT(dnmalloc does not work with pthreads)
+        AC_MSG_RESULT([dnmalloc does not work with pthreads])
         ;;
 
@@ -123 +124 @@
         mynetbsd=yes
         selectconfig=netbsd
-        AC_MSG_RESULT(bug with libresolve)
+        AC_MSG_RESULT([bug with libresolve])
         ;;
 
@@ -132 +133 @@
                 i*86)
                 AC_DEFINE(HOST_IS_I86SOLARIS)
-                AC_MSG_RESULT(vsnprintf prototype)
+                AC_MSG_RESULT([vsnprintf prototype])
                 ;;
                 *)
-                AC_MSG_RESULT(none)
+                AC_MSG_RESULT([none])
                 ;;
         esac
@@ -156 +157 @@
         selectconfig=solaris
         AC_DEFINE(HOST_IS_SOLARIS)
-        AC_MSG_RESULT(none)
+        AC_MSG_RESULT([none])
         ;;
 
@@ -173 +174 @@
                 CFLAGS="$CFLAGS -qstrict"
           fi
-          AC_MSG_RESULT(AIX size_t in the accept call and optimize O3 qstrict)
+          AC_MSG_RESULT([AIX size_t in the accept call and optimize O3 qstrict])
         else
-          AC_MSG_RESULT(AIX size_t in the accept call)
+          AC_MSG_RESULT([AIX size_t in the accept call])
         fi
         ;;
         
         *hpux*)
-        AC_MSG_RESULT(HPUX need _XOPEN_SOURCE_EXTENDED for h_errno)
+        AC_MSG_RESULT([HPUX need _XOPEN_SOURCE_EXTENDED for h_errno])
         AC_DEFINE(HOST_IS_HPUX)
         if test "x$GCC" != "xyes"; then
@@ -193 +194 @@
 
         *ultrix*)
-        AC_MSG_RESULT(ULTRIX getcwd uses popen)
+        AC_MSG_RESULT([ULTRIX getcwd uses popen])
         AC_DEFINE(HAVE_BROKEN_GETCWD)
         ;;
 
         *)
-        AC_MSG_RESULT(none)
+        AC_MSG_RESULT([none])
         ;;
 esac

trunk/docs/Changelog

@@ -1 +1 @@
 2.5.3:
+        * disable dnmalloc on MacOS X, doesn't work properly
+        * stat -> lstat in sh_unix_file_exists (OS X nameforks, report
+          by David)
         * Fix problem in standalone trustfile, does not work correctly on
           group-writeable files (reported by David).

trunk/src/sh_unix.c

@@ -4272 +4272 @@
   SL_ENTER(_("sh_unix_file_exists"));
 
-  if (-1 == retry_stat(FIL__, __LINE__, path, &buf))
-    SL_RETURN( S_FALSE, _("sh_unix_file_exists"));
+  if (0 == retry_lstat(FIL__, __LINE__, path, &buf))
+    SL_RETURN( S_TRUE,   _("sh_unix_file_exists"));
   else 
-    SL_RETURN( S_TRUE,  _("sh_unix_file_exists"));
+    SL_RETURN( S_FALSE,  _("sh_unix_file_exists"));
 }
 

trunk/src/trustfile.c

@@ -366 +366 @@
 #else
       strncat(rbuf, "/",   rsz-strlen(rbuf)-1);
+      rbuf[rsz-1] = '\0';
       strncat(rbuf, fname, rsz-strlen(rbuf)-1);
       rbuf[rsz-1] = '\0';