Re: NOT YET: Release of version 4.5.2 of sharutils

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Bruce Korb on 9/3/2005 4:20 PM:
> It seems I'm not registered for alpha uploads yet.  Stay tuned.  :(
> Meanwhile, there's a temporary copy here:
> 
>   http://autogen.sf.net/data/sharutils-4.5.2.tar.gz

Unfortunately, this file unpacks as sharutils-4.5.2-pre1/ rather than
sharutils-4.5.2/, and is identical to the pre-release version (i.e. it
still needs the patches below).  Did you upload the wrong file?

ChangeLog:
2005-08-29  Eric Blake  <address@hidden>  (tiny change)

        * unshar.c (main): Use current arg in final loop.

tests/ChangeLog:
2005-08-30  Eric Blake  <address@hidden>  (tiny change)

        * shar-2 (UNSHAR): Define and use.

- --
Life is short - so eat dessert first!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDHL/484KuGfSFAYARAi5mAJ97Th0gWIXSCUf60uD3CqPETOCjTwCgokyQ
feynaGOk5elLa9jnZ6pZNUQ=
=iZxs
-----END PGP SIGNATURE-----

--- sharutils-4.5.2-pre1.orig/src/unshar.c      2005-08-03 21:52:28.000000000 
-0600
+++ sharutils-4.5.2-pre1/src/unshar.c   2005-08-29 21:56:33.802625000 -0600
@@ -1,5 +1,5 @@
 /* Handle so called `shell archives'.
-   Copyright (C) 1994, 1995, 1996, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 2002, 2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -435,7 +435,7 @@ warranty; not even for MERCHANTABILITY o
           if (arg == NULL)
             break;
 
-          sz = strlen (current_directory) + strlen (argv[optind]) + 2;
+         sz = strlen (current_directory) + strlen (arg) + 2;
           if (sz > buflen)
             {
               buflen = sz + 32;

--- sharutils-4.5.2-pre1.orig/tests/shar-2      2005-08-18 16:40:39.000000000 
-0600
+++ sharutils-4.5.2-pre1/tests/shar-2   2005-08-30 06:39:06.473625000 -0600
@@ -21,6 +21,7 @@
 done
 
 : ${SHAR=`cd ../src ; pwd`/shar}
+: ${UNSHAR=`cd ../src ; pwd`/unshar}
 (cd ${tmppfx}.d ; ${SHAR} -m . 2>/dev/null) | \
   sed -e 6,10d -e 's/_sh[0-9][0-9][0-9][0-9][0-9]*/_sh_PID_/' \
   > ${tmppfx}.shar
@@ -28,7 +29,7 @@
 : ${DIFF=diff}
 
 ( cd ${tmppfx}.dir
-  unshar ../${tmppfx}.shar )
+  ${UNSHAR} ../${tmppfx}.shar ) 2>/dev/null
 
 ${DIFF} -r ${tmppfx}.d ${tmppfx}.dir || exit 1