diff options
author | martin <martin> | 2006-04-20 23:22:04 +0000 |
---|---|---|
committer | martin <martin> | 2006-04-20 23:22:04 +0000 |
commit | ce5b3f0eceff86e9657e526b8624c2a5ce56cb3d (patch) | |
tree | e26aac7e643f7d2a3038759b1194e3c0694ff06f | |
parent | e721d47c545cabb0c7d9b8cd6601f2e20af5c417 (diff) | |
download | pkgsrc-ce5b3f0eceff86e9657e526b8624c2a5ce56cb3d.tar.gz |
Fix string output of IDENTIFY on little endian machines (which I broke
with the previous version). Noted by Rhialto in private mail.
-rw-r--r-- | sysutils/smartmontools/distinfo | 4 | ||||
-rw-r--r-- | sysutils/smartmontools/patches/patch-ad | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo index 47a2fd1145d..d3e09ca7074 100644 --- a/sysutils/smartmontools/distinfo +++ b/sysutils/smartmontools/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2005/10/27 21:36:13 kristerw Exp $ +$NetBSD: distinfo,v 1.10 2006/04/20 23:22:04 martin Exp $ SHA1 (smartmontools-5.32.tar.gz) = 2af09136578ea59565ad00b3638afe9700ed26a2 RMD160 (smartmontools-5.32.tar.gz) = 6692df8996bc3f6a1b52b10286d92b116874e1cd @@ -6,4 +6,4 @@ Size (smartmontools-5.32.tar.gz) = 408224 bytes SHA1 (patch-aa) = 2f22d9bd911ce825c1ca888cceb4535bba606671 SHA1 (patch-ab) = 8934b29e17bc0826c7e1bb5cf27025ef574c914b SHA1 (patch-ac) = 477db70947e5cab73264ff8603bbfce8496d2616 -SHA1 (patch-ad) = 95a89254e570bc48f2422d80b4015885ca4135bc +SHA1 (patch-ad) = 61d730fc8f435edd2473c33d37d3e02cd9184b13 diff --git a/sysutils/smartmontools/patches/patch-ad b/sysutils/smartmontools/patches/patch-ad index 938cf04f2ef..5ac6baea287 100644 --- a/sysutils/smartmontools/patches/patch-ad +++ b/sysutils/smartmontools/patches/patch-ad @@ -1,15 +1,18 @@ -$NetBSD: patch-ad,v 1.1 2005/09/07 07:32:10 martin Exp $ +$NetBSD: patch-ad,v 1.2 2006/04/20 23:22:04 martin Exp $ --- ataprint.c.orig 2004-06-04 22:59:16.000000000 +0200 -+++ ataprint.c 2005-08-15 22:18:08.000000000 +0200 -@@ -90,7 +90,11 @@ void formatdriveidstring(char *out, cons ++++ ataprint.c 2006-04-21 01:10:45.000000000 +0200 +@@ -90,7 +90,14 @@ char tmp[65]; n = n > 64 ? 64 : n; +#ifndef __NetBSD__ swapbytes(tmp, in, n); +#else -+ strncpy(tmp, in, n); /* NetBSD delivers host byte order strings */ ++ if (isbigendian()) ++ strncpy(tmp, in, n); ++ else ++ swapbytes(tmp, in, n); +#endif tmp[n] = '\0'; trim(out, tmp); |