* m4/macros/host_macros.m4: for macosx, change architecture value

from "Power Macintosh" to "powerpc".

* libamu/util.c (xstrlcpy): format 'len' parameter as u_long, not
int (it's a size_t).

diff --git a/ChangeLog b/ChangeLog
index 03a1c849f8ef22f23549f72a17853bdb8384ed83..7c6eceda291fb35717b1e8c5ed9b36f3a419af98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-29  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * m4/macros/host_macros.m4: for macosx, change architecture value
+       from "Power Macintosh" to "powerpc".
+
+       * libamu/util.c (xstrlcpy): format 'len' parameter as u_long, not
+       int (it's a size_t).
+
 2005-04-16  Erez Zadok  <ezk@cs.sunysb.edu>
 
        * scripts/amd.conf.5, doc/am-utils.texi (normalize_slashes

diff --git a/NEWS b/NEWS
index 6a7e4912a222ab3f6c9ada418f9c314f7fd04227..3b575f13ea880de07236da78f214f5e14d560a9e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ of strncpy/strlcpy to ensure safety.
        * pawd handles all file systems
        * fix double-free in type:=nfsx
        * timeo and retrans shouldn't be set for type:=toplvl
+       * k/arch value on macosx should be "powerpc" not "Power Macintosh"
 
 *** Notes specific to am-utils version 6.1-rc1
 

diff --git a/libamu/strutil.c b/libamu/strutil.c
index a3d43ef6f01fc942c91dbfdda43cfcfc054ecea4..a55b138fa733744634c0f91059b74c5c4172cb40 100644 (file)
--- a/libamu/strutil.c
+++ b/libamu/strutil.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: strutil.c,v 1.16 2005/04/09 18:15:35 ottavio Exp $
+ * $Id: strutil.c,v 1.17 2005/04/29 18:48:19 ezk Exp $
  *
  */
 
@@ -94,7 +94,7 @@ void
 xstrlcpy(char *dst, const char *src, size_t len)
 {
   if (len < 0) {
-    plog(XLOG_ERROR, "xstrlcpy: illegal len %d", len);
+    plog(XLOG_ERROR, "xstrlcpy: illegal len %lu", (u_long) len);
     return;
   }
   if (len == 0)

diff --git a/m4/macros/host_macros.m4 b/m4/macros/host_macros.m4
index 855db154eb2a6049142a3356809df0dd724c8e26..27d2ed5572c9e05ce4780841f98069534fbdef56 100644 (file)
--- a/m4/macros/host_macros.m4
+++ b/m4/macros/host_macros.m4
@@ -55,6 +55,7 @@ AC_DEFUN([AMU_HOST_MACROS],
        sun3x ) host_arch=sun3 ;;
        sun )   host_arch=`(arch) 2>/dev/null` || host_arch=unknown ;;
        i?86 )  host_arch=i386 ;; # all x86 should show up as i386
+       Power*Macintosh )       host_arch=powerpc ;;
   esac
   AC_DEFINE_UNQUOTED(HOST_ARCH, "$host_arch")
   AC_MSG_RESULT($host_arch)