On Jul 28, 2008, at 11:10 AM, Ralf S. Engelschall wrote:
On Mon, Jul 28, 2008, Jeff Johnson wrote:
[...]
@@ -0,0 +1,92 @@
+//
=====================================================================
=========
+//
+// Copyright (C) 2005 Jason Evans <[EMAIL PROTECTED]>. All
rights reserved.
+//
[...]
You are sure we already want C++/C99-style comments in the RPM code
base?
I'm quite sure that we dinna want the original patch as sent:
--- tools/rpmmtree.c.orig 2008-07-24 15:03:04.000000000 +0200
+++ tools/rpmmtree.c 2008-07-24 15:06:55.000000000 +0200
@@ -53,6 +53,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>
@@ -69,6 +73,11 @@
#include <rpmts.h>
#endif
+#include "config.h"
+#ifndef HAVE_ASPRINTF
+#include "../xar/lib/asprintf.h"
+#endif
+
#define RPM_LIST_HEAD(name, type) \
struct name { struct type *lh_first; }
#define RPM_LIST_ENTRY(type) \
@@ -1015,7 +1024,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 +1509,7 @@
/[EMAIL PROTECTED]@*/ break;
case MTREE_KEYS_SIZE:
/[EMAIL PROTECTED]@*/
- ip->sb.st_size = strtouq(val, &ep, 10);
+ ip->sb.st_size = strtoul(val, &ep, 10);
/[EMAIL PROTECTED]@*/
if (*ep != '\0')
mtree_error("invalid size %s", val);
todo++, thanks for noticing.
73 de Jeff
Ralf S. Engelschall
[EMAIL PROTECTED]
www.engelschall.com
______________________________________________________________________
RPM Package Manager http://rpm5.org
Developer Communication List rpm-devel@rpm5.org
______________________________________________________________________
RPM Package Manager http://rpm5.org
Developer Communication List rpm-devel@rpm5.org
