RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   16-Aug-2008 19:05:37
  Branch: rpm-5_1                          Handle: 2008081617053601

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES
    rpm/tools               rpmmtree.c

  Log:
    - jbj: include misc/asprintf.h for use by rpmmtree on QNX.

  Summary:
    Revision    Changes     Path
    1.2288.2.77 +1  -0      rpm/CHANGES
    2.1.2.4     +10 -2      rpm/tools/rpmmtree.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.76 -r1.2288.2.77 CHANGES
  --- rpm/CHANGES	13 Aug 2008 17:05:25 -0000	1.2288.2.76
  +++ rpm/CHANGES	16 Aug 2008 17:05:36 -0000	1.2288.2.77
  @@ -1,4 +1,5 @@
   5.1.4 -> 5.1.5:
  +    - jbj: include misc/asprintf.h for use by rpmmtree on QNX.
       - jbj: move glob/fnmatch into -lrpmio from -lrpmmisc.
       - jbj: lua: don't exit chroot if already within running script.
       - jbj: rescusitate "make check".
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/rpmmtree.c
  ============================================================================
  $ cvs diff -u -r2.1.2.3 -r2.1.2.4 rpmmtree.c
  --- rpm/tools/rpmmtree.c	16 Jun 2008 13:18:47 -0000	2.1.2.3
  +++ rpm/tools/rpmmtree.c	16 Aug 2008 17:05:37 -0000	2.1.2.4
  @@ -43,6 +43,10 @@
   #include <signal.h>
   #include <stdarg.h>
   
  +#if !defined(HAVE_ASPRINTF)
  +#include "asprintf.h"
  +#endif
  +
   #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
   #define	HAVE_ST_FLAGS	1	/* XXX TODO: should be AutoFu test */
   #else
  @@ -53,6 +57,10 @@
   #define	st_mtimespec	st_mtim
   #endif
   
  +#if defined(__QNXNTO__)
  +#define	st_mtimespec	st_mtime
  +#endif
  +
   #include <rpmio_internal.h>	/* XXX fdInitDigest() et al */
   #include <fts.h>
   #include <ugid.h>
  @@ -1015,7 +1023,7 @@
   /*==============================================================*/
   
   /* XXX *BSD systems already have getmode(3) and setmode(3) */
  -#if defined(__linux__) || defined(__LCLINT__)
  +#if defined(__linux__) || defined(__LCLINT__) || defined(__QNXNTO__)
   #if !defined(HAVE_GETMODE) || !defined(HAVE_SETMODE)
   
   #define	SET_LEN	6		/* initial # of bitcmd struct to malloc */
  @@ -1500,7 +1508,7 @@
   	    /*@switchbreak@*/ break;
   	case MTREE_KEYS_SIZE:
   /*@-unrecog@*/
  -	    ip->sb.st_size = strtouq(val, &ep, 10);
  +	    ip->sb.st_size = strtoul(val, &ep, 10);
   /*@=unrecog@*/
   	    if (*ep != '\0')
   		mtree_error("invalid size %s", val);
  @@ .