Try the attached patch, it remove the '-w10' flags because the irix od
doesn't accept it.
Jean-Louis
Jean-Francois Malouin wrote:
Not sure if this is relevant (first time I label a tape with
2.5.2-20070508 onward) but I got this from amlabel on a test server
running irix 6.5.57m compiled 64bit (CFLAG='-64 -mips4') with the
native sgi C compiler from the 2.5.2-20070523 snapshot:
# su amanda -c "/opt/amanda/spantest/sbin/amlabel spantest spantest-000010 slot
10"
labeling tape in slot 10 (/hw/tape/tps6d4nrnsv):
rewinding, reading labelamlabel: Empty amanda header: buflen=32768 lsize=32768
Illegal option -- w
Usage: od [-bcdDfFhoOsSvxX] [file] [[+]offset[.][b]]
od [-v] [-A addr_base] [-j skip] [-N count] [-t type_str] ...
[file...]
amlabel: strange amanda header: ""
amlabel: Expected: "<Non-empty line>" Actual: "<null>" , not an amanda tape
rewinding, writing label spantest-000010, checking label, done.
regards,
jf
* Jean-Louis Martineau <martineau AT zmanda DOT com> [20070524 09:26]:
Hello,
It's time for everyone to test the latest 2.5.2 snapshot before we
release 2.5.2p1.
Some bugs were found in amanda-2.5.2, most of them because of the new
IPv6 code and incompatibility with some platform:
* Many IPv6 bugs
o missing sockaddr_storage
o missing AI_V4MAPPED and AI_ALL
o compare of IPv4 and IPv6 v4mapped address.
o (bsd/bsdudp): server use two sockets, one for IPv4 and one
for IPv6
* amflush/autoflush
* chown/chmod
* amstatus
* compilation on some platform
* others small bugs
All of these bugs are fixed in the latest snapshot. We plan to release
amanda-2.5.2p1 next week.
I'm asking the help of all users to test it before we release 2.5.2p1,
don't wait the release to test it.
Latest snapshot can be found at http://www.zmanda.com/community-builds.php
Jean-Louis
diff -u -r --show-c-function --new-file
--exclude-from=/home/martinea/src.orig/amanda.diff
--ignore-matching-lines='$Id:' amanda-2.5.2/common-src/util.c
amanda-2.5.2.popen/common-src/util.c
--- amanda-2.5.2/common-src/util.c 2007-05-23 08:06:36.000000000 -0400
+++ amanda-2.5.2.popen/common-src/util.c 2007-05-28 07:20:03.000000000
-0400
@@ -590,14 +590,14 @@ hexdump(
{
ssize_t rc = -1;
- FILE *stream = popen("od -w10 -c -x -", "w");
+ FILE *stream = popen("od -c -x -", "w");
if (stream != NULL) {
fflush(stdout);
rc = (ssize_t)fwrite(buffer, len, 1, stream);
if (ferror(stream))
rc = -1;
- fclose(stream);
+ pclose(stream);
}
return rc;
}
|