Fix some off_t format strings. hexedit now displays addresses correctly

on big-endian platforms.

4 files changed, 54 insertions, 3 deletions

diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index 53ec89a6eca..856bd06e4f3 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/07/21 16:44:36 martti Exp $
+# $NetBSD: Makefile,v 1.17 2003/08/08 13:24:56 scw Exp $
 #
 
 DISTNAME=	hexedit-1.2.2
-PKGREVISION=			1
+PKGREVISION=			2
 WRKSRC=		${WRKDIR}/hexedit
 CATEGORIES=	editors
 MASTER_SITES=	http://www.chez.com/prigaux/
diff --git a/editors/hexedit/distinfo b/editors/hexedit/distinfo
index 7651bda3c91..2654d67f664 100644
--- a/editors/hexedit/distinfo
+++ b/editors/hexedit/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/01/18 22:59:30 mjl Exp $
+$NetBSD: distinfo,v 1.5 2003/08/08 13:24:56 scw Exp $
 
 SHA1 (hexedit-1.2.2.src.tgz) = 6f145f07717680fb088fb56f9813ba429bfae6b3
 Size (hexedit-1.2.2.src.tgz) = 56247 bytes
 SHA1 (patch-aa) = fbb203fb3e86b5ac2d029e9859112d5e7ec37344
 SHA1 (patch-ac) = 969c8f19692e63eb817f917f35b8ff871e689ed9
+SHA1 (patch-ad) = fda8797b504b572d68842cdc0cfba2c1c6f02de9
+SHA1 (patch-ae) = a6f76bf77125efce668c36acd4e769c3ecad0012
diff --git a/editors/hexedit/patches/patch-ad b/editors/hexedit/patches/patch-ad
new file mode 100644
index 00000000000..a2ee3b8343c
--- /dev/null
+++ b/editors/hexedit/patches/patch-ad
@@ -0,0 +1,31 @@
+--- display.c.orig	2003-08-08 13:50:59.000000000 +0100
++++ display.c	2003-08-08 14:10:45.000000000 +0100
+@@ -144,7 +144,7 @@
+ 
+   move(0,0);
+   for (i = 0; i < nbBytes; i += lineLength) displayLine(i, nbBytes);
+-  for (; i < page; i += lineLength) PRINTW(("%08lX\n", base + i))
++  for (; i < page; i += lineLength) PRINTW(("%08" INT_FMT "\n", base + i))
+ 
+   attrset(NORMAL);
+   move(LINES - 1, 0);
+@@ -153,8 +153,8 @@
+   if (isReadOnly) i = '%';
+   else if (edited) i = '*';
+   else i = '-';
+-  printw("-%c%c  %s       --0x%llX", i, i, baseName, base + cursor);
+-  if (MAX(fileSize, lastEditedLoc)) printw("/0x%llX", getfilesize());
++  printw("-%c%c  %s       --0x%" INT_FMT, i, i, baseName, base + cursor);
++  if (MAX(fileSize, lastEditedLoc)) printw("/0x%" INT_FMT, getfilesize());
+   if (option == bySector) printw("--sector %d", (base + cursor) / SECTOR_SIZE);
+ 
+   move(cursor / lineLength, computeCursorXCurrentPos());
+@@ -164,7 +164,7 @@
+ {
+   int i;
+ 
+-  PRINTW(("%08lX   ", base + offset))
++  PRINTW(("%08" INT_FMT "   ", base + offset))
+   for (i = offset; i < offset + lineLength; i++) {
+      if (i > offset) MAXATTRPRINTW(bufferAttr[i] & MARKED, (((i - offset) % blocSize) ? " " : "  "))
+      if (i < max) ATTRPRINTW(bufferAttr[i], ("%02X", buffer[i]))
diff --git a/editors/hexedit/patches/patch-ae b/editors/hexedit/patches/patch-ae
new file mode 100644
index 00000000000..22e90458ea2
--- /dev/null
+++ b/editors/hexedit/patches/patch-ae
@@ -0,0 +1,18 @@
+--- hexedit.h.orig	2003-08-08 13:51:08.000000000 +0100
++++ hexedit.h	2003-08-08 13:52:50.000000000 +0100
+@@ -2,6 +2,7 @@
+ #define HEXEDIT_H
+ 
+ #include "config.h"
++#include <inttypes.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -26,6 +27,7 @@
+ 
+ 
+ #define INT off_t
++#define INT_FMT PRIX64	/* Modern, Sane OSs have a 64-bit off_t */
+ 
+ /*******************************************************************************/
+ /* Macros */