* conf/transp/transp_tli.c (get_nfs_version): use proper type for

versout on Solaris (rpcvcers_t).

* amd/mapc.c (mapc_showtypes): if last map type to print, don't
append newline or comma to it.

* libamu/mount_fs.c (print_nfs_args): cast struct netbuf pointer
to %lx because on Solaris 10 sparc gcc-3.4.3 complains about
casting it to an int (size is different).

diff --git a/.cvsignore b/.cvsignore
index 07d832606dd2b5a75ef9a144bcad3ea17847500f..97ca4a578a97e2f5d09773ba483f9924dce1bccb 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -139,3 +139,4 @@ A.powerpc-apple-darwin7.8.0
 A.i386-unknown-freebsd6.0
 A.ia64-unknown-linux-rhel4
 A.i386-pc-linux-rhel4
+A.sparc-sun-solaris2.10

diff --git a/ChangeLog b/ChangeLog
index d123f6cb27ae30af797301d5efb68e0ec4b43099..e3b031029c670b09aea096910d1d72095ba20d56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2005-03-18  Erez Zadok  <ezk@cs.sunysb.edu>
 
+       * conf/transp/transp_tli.c (get_nfs_version): use proper type for
+       versout on Solaris (rpcvcers_t).
+
+       * amd/mapc.c (mapc_showtypes): if last map type to print, don't
+       append newline or comma to it.
+
+       * libamu/mount_fs.c (print_nfs_args): cast struct netbuf pointer
+       to %lx because on Solaris 10 sparc gcc-3.4.3 complains about
+       casting it to an int (size is different).
+
        * configure.in, NEWS: prepare for 6.1-rc1 release.
 
 2005-03-17  Erez Zadok  <ezk@cs.sunysb.edu>

diff --git a/amd/mapc.c b/amd/mapc.c
index 286763d8cda304c9b4c1a8e8ed92904764b9c9fd..d21c8dc9c9d8564630d42fc88f4d3c2d7913636c 100644 (file)
--- a/amd/mapc.c
+++ b/amd/mapc.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: mapc.c,v 1.26 2005/03/10 08:12:34 ezk Exp $
+ * $Id: mapc.c,v 1.27 2005/03/19 03:05:25 ezk Exp $
  *
  */
 
@@ -360,6 +360,8 @@ mapc_showtypes(char *buf)
   buf[0] = '\0';
   for (mt = maptypes; mt < lastmt; mt++) {
     strcat(buf, mt->name);
+    if (mt == (lastmt-1))
+      break;         /* if last one, don't do strcat's that follow */
     l += strlen(mt->name);
     if (--i > 0) {
       strcat(buf, ", ");

diff --git a/conf/transp/transp_tli.c b/conf/transp/transp_tli.c
index 187fb7fbc33aa5e927ccc370921a926a68417643..be543161c46d024e65de7115ace1df65f306f5e5 100644 (file)
--- a/conf/transp/transp_tli.c
+++ b/conf/transp/transp_tli.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: transp_tli.c,v 1.30 2005/03/03 02:59:02 ezk Exp $
+ * $Id: transp_tli.c,v 1.31 2005/03/19 03:05:25 ezk Exp $
  *
  * TLI specific utilities.
  *      -Erez Zadok <ezk@cs.columbia.edu>
@@ -746,7 +746,11 @@ u_long
 get_nfs_version(char *host, struct sockaddr_in *sin, u_long nfs_version, const char *proto)
 {
   CLIENT *clnt = NULL;
+#ifdef HAVE_CLNT_CREATE_VERS_TIMED
+  rpcvers_t versout;
+#else /* not HAVE_CLNT_CREATE_VERS_TIMED */
   u_long versout;
+#endif /* not HAVE_CLNT_CREATE_VERS_TIMED */
   struct timeval tv;
 
   /*

diff --git a/libamu/mount_fs.c b/libamu/mount_fs.c
index f2c2cd1ad70fc3c4d0905bc158b00300bd581708..ca40d25eb12bdf2617c2eaf201cd30ea534179b2 100644 (file)
--- a/libamu/mount_fs.c
+++ b/libamu/mount_fs.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: mount_fs.c,v 1.47 2005/03/05 07:09:17 ezk Exp $
+ * $Id: mount_fs.c,v 1.48 2005/03/19 03:05:25 ezk Exp $
  *
  */
 
@@ -869,7 +869,7 @@ print_nfs_args(const nfs_args_t *nap, u_long nfs_version)
        nbp->maxlen, nbp->len,
        get_hex_string(nbp->len, nbp->buf));
   nbp = nap->syncaddr;
-  plog(XLOG_DEBUG, "NA->syncaddr {netbuf} 0x%x", (int) nbp);
+  plog(XLOG_DEBUG, "NA->syncaddr {netbuf} 0x%lx", (long) nbp);
   kncp = nap->knconf;
   plog(XLOG_DEBUG, "NA->knconf->semantics %lu", (u_long) kncp->knc_semantics);
   plog(XLOG_DEBUG, "NA->knconf->protofmly \"%s\"", kncp->knc_protofmly);