Hello community,
here is the log from the commit of package sharutils
checked in at Tue May 16 02:21:14 CEST 2006.
--------
--- sharutils/sharutils.changes 2006-01-25 21:30:58.000000000 +0100
+++ sharutils/sharutils.changes 2006-05-15 19:00:05.000000000 +0200
@@ -1,0 +2,29 @@
+Mon May 15 15:39:09 CEST 2006 - schwab@suse.de
+
+- Update to sharutils 4.6.2.
+
+2006-03-24 Santiago Vila
+
+ * uudecode.c(decode): make clear the name of the file causing problems
+
+2005-11-15 Eric Blake
+
+ * uudecode.c (O_BINARY): Define for all platforms.
+ (decode): Always open with binary, where it matters.
+ * uuencode.c [__CYGWIN__]: Include io.h for setmode.
+ (O_BINARY): Define for all platforms.
+ (main): Always open with binary, where it matters.
+ (main) [__CYGWIN__]: Use setmode to make stdin binary.
+
+2005-11-06 Bruce Korb
+
+ * src/shar.c(echo_status): new - report status in consistent fashion.
+ (throughout): remove many strings to scripts.def file.
+ * src/scripts.def: add many new entries and alphabetize
+ * tests/shar-1.ok: adjust to changes
+ * tests/Makefile.am: add 'shar-3' test and a clean rule
+ * tests/shar-3: new - test large multi part archive
+ * tests/shar-1: delete varying text, not arbitrary lines from sample
+ * tests/shar-2: remove unnecessary line removal
+
+-------------------------------------------------------------------
Old:
----
sharutils-4.6.tar.bz2
New:
----
format.diff
sharutils-4.6.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sharutils.spec ++++++
--- /var/tmp/diff_new_pack.r1YfQh/_old 2006-05-16 02:20:48.000000000 +0200
+++ /var/tmp/diff_new_pack.r1YfQh/_new 2006-05-16 02:20:48.000000000 +0200
@@ -1,11 +1,11 @@
#
-# spec file for package sharutils (Version 4.6)
+# spec file for package sharutils (Version 4.6.2)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
@@ -18,12 +18,13 @@
Autoreqprov: on
Provides: sharutil
Obsoletes: sharutil
-Version: 4.6
+Version: 4.6.2
Release: 1
Summary: GNU shar utilities
Source: sharutils-%{version}.tar.bz2
Patch: quoting.diff
Patch1: testsuite.diff
+Patch2: format.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: /bin/ln /bin/rm %{install_info_prereq}
@@ -47,6 +48,7 @@
%setup -q
%patch
%patch1
+%patch2
%build
autoreconf --force --install
@@ -82,6 +84,8 @@
%doc %{_mandir}/*/*.gz
%changelog -n sharutils
+* Mon May 15 2006 - schwab@suse.de
+- Update to sharutils 4.6.2.
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Oct 05 2005 - schwab@suse.de
@@ -169,6 +173,27 @@
* Tue Jan 04 2000 - schwab@suse.de
- Y2K fixes from sharutils 4.2.1
- Fix mktemp usage and quoting in mailshar
+* Tue Jan 01 2000 - nobody@suse.de
+ 2006-03-24 Santiago Vila
+ * uudecode.c(decode): make clear the name of the file causing problems
+* Tue Jan 01 2000 - nobody@suse.de
+ 2005-11-15 Eric Blake
+ * uudecode.c (O_BINARY): Define for all platforms.
+ (decode): Always open with binary, where it matters.
+ * uuencode.c [__CYGWIN__]: Include io.h for setmode.
+ (O_BINARY): Define for all platforms.
+ (main): Always open with binary, where it matters.
+ (main) [__CYGWIN__]: Use setmode to make stdin binary.
+* Tue Jan 01 2000 - nobody@suse.de
+ 2005-11-06 Bruce Korb
+ * src/shar.c(echo_status): new - report status in consistent fashion.
+ (throughout): remove many strings to scripts.def file.
+ * src/scripts.def: add many new entries and alphabetize
+ * tests/shar-1.ok: adjust to changes
+ * tests/Makefile.am: add 'shar-3' test and a clean rule
+ * tests/shar-3: new - test large multi part archive
+ * tests/shar-1: delete varying text, not arbitrary lines from sample
+ * tests/shar-2: remove unnecessary line removal
* Tue Oct 12 1999 - ro@suse.de
- added tcld to neededforbuild
* Mon Sep 13 1999 - bs@suse.de
++++++ format.diff ++++++
--- src/shar.c
+++ src/shar.c
@@ -1028,7 +1028,7 @@
char *nm = archive_name ? archive_name : "a multipart";
char *pz = xmalloc (sizeof(part_z) + strlen(nm) + 16);
sprintf (pz, part_z, part_number, nm);
- fprintf (output, file_leader_z, pz, "", sharpid);
+ fprintf (output, file_leader_z, pz, "", PACKAGE, VERSION, sharpid);
free (pz);
}
++++++ quoting.diff ++++++
--- /var/tmp/diff_new_pack.r1YfQh/_old 2006-05-16 02:20:48.000000000 +0200
+++ /var/tmp/diff_new_pack.r1YfQh/_new 2006-05-16 02:20:48.000000000 +0200
@@ -2,7 +2,7 @@
+++ configure.ac
@@ -99,6 +99,7 @@
AM_GNU_GETTEXT
- AM_GNU_GETTEXT_VERSION([0.14.4])
+ AM_GNU_GETTEXT_VERSION([0.14.5])
AM_WITH_DMALLOC
+gl_QUOTEARG
@@ -1353,20 +1353,31 @@
+ AC_TYPE_MBSTATE_T
+ AC_FUNC_MBRTOWC
+])
+--- src/scripts.def
++++ src/scripts.def
+@@ -159,7 +159,7 @@
+ body = <<- _EOBody_
+ if ${md5check}
+ then (
+- ${MD5SUM} -c >/dev/null 2>&1 || ${echo} '%s: %s'
++ ${MD5SUM} -c >/dev/null 2>&1 || ${echo} %s: '%s'
+ ) << %s
+ _EOBody_;
+ };
--- src/scripts.x
+++ src/scripts.x
-@@ -67,7 +67,7 @@
- static const char md5test_z[] =
+@@ -131,7 +131,7 @@
+ #line 160 "scripts.def"
" if ${md5check}\n\
then (\n\
-- ${MD5SUM} -c >/dev/null 2>&1 || ${echo} '%s:' '%s'\n\
+- ${MD5SUM} -c >/dev/null 2>&1 || ${echo} '%s: %s'\n\
+ ${MD5SUM} -c >/dev/null 2>&1 || ${echo} %s: '%s'\n\
) << %s\n";
- static const char md5check_z[] =
+ static const char query_answers_z[769] =
--- src/shar.c
+++ src/shar.c
-@@ -143,6 +143,7 @@
+@@ -147,6 +147,7 @@
#include "getopt.h"
#include "inttostr.h"
#include "md5.h"
@@ -1374,7 +1385,7 @@
/* No Brown-Shirt mode. */
static int vanilla_operation_mode = 0;
-@@ -634,6 +635,8 @@
+@@ -698,6 +699,8 @@
generate_mkdir (path)
const char *path;
{
@@ -1383,27 +1394,41 @@
/* If already generated code for this dir creation, don't do again. */
{
-@@ -674,14 +677,14 @@
+@@ -738,18 +741,18 @@
/* Generate the text. */
- fprintf (output, "if test ! -d '%s'; then\n", path);
+ fprintf (output, "if test ! -d %s; then\n", quoted_path);
if (!quiet_unshar_mode)
- fprintf (output, "\
-- $echo $echo_n 'x -' '%s: '$echo_c\n\
-- if mkdir '%s'; then $echo '%s'; else $echo '%s'; fi\n",
-- path, path, N_("created"), N_("failed to create"));
-+ $echo $echo_n 'x -' %s:' '$echo_c\n\
-+ if mkdir %s; then $echo '%s'; else $echo '%s'; fi\n",
-+ quoted_path, quoted_path, N_("created"), N_("failed to create"));
+ {
+ const char* did_pz =
+- N_("x - created directory `%s'\\''.");
++ N_("x - created directory `'%s\\''.");
+ const char* not_pz =
+- N_("x - failed to create directory `%s'\\''.");
+- fprintf (output, " mkdir '%s'\n", path);
+- echo_status ("test $? -eq 0", did_pz, not_pz, path, 1);
++ N_("x - failed to create directory `'%s\\''.");
++ fprintf (output, " mkdir %s\n", quoted_path);
++ echo_status ("test $? -eq 0", did_pz, not_pz, quoted_path, 1);
+ }
else
-- fprintf (output, " mkdir '%s'\n", path);
-+ fprintf (output, " mkdir %s\n", quoted_path);
+- fprintf (output, " mkdir '%s' || exit 1\n", path);
++ fprintf (output, " mkdir %s || exit 1\n", quoted_path);
fputs ("fi\n", output);
}
-@@ -960,6 +963,7 @@
+@@ -988,7 +991,7 @@
+ failed. */
+
+ fputs (" :\n", output);
+- echo_status ("test $? -ne 0", N_("restore of %s failed"), NULL,
++ echo_status ("test $? -ne 0", N_("restore of '%s' failed"), NULL,
+ restore_name, 0);
+
+ fputs ("'\n${echo} '", output);
+@@ -1052,6 +1055,7 @@
const char *file_type; /* text of binary */
const char *file_type_remote; /* text or binary, avoiding locale */
struct tm *restore_time;
@@ -1411,7 +1436,7 @@
/* Check to see that this is still a regular file and readable. */
-@@ -974,6 +978,11 @@
+@@ -1066,6 +1070,11 @@
return 1;
}
@@ -1423,20 +1448,16 @@
/* If file_size_limit set, get the current output length. */
if (file_size_limit)
-@@ -1005,10 +1014,10 @@
- exit 0\n",
- */
- fprintf (output, "\
--: || $echo '%s' '%s' '%s'\n\
-+: || $echo '%s' %s '%s'\n\
- $echo '%s' '%d,' '%s' '%d'\n\
- exit 0\n",
-- N_("restore of"), restore_name, N_("failed"),
-+ N_("restore of"), quoted_restore_name, N_("failed"),
- N_("End of part"), part_number,
- N_("continue with part"), part_number + 1);
-
-@@ -1154,23 +1163,24 @@
+@@ -1079,7 +1088,7 @@
+ ? struct_stat.st_size + struct_stat.st_size / 3
+ : struct_stat.st_size)
+ > remaining_size))
+- change_files (restore_name, remaining_size);
++ change_files (quoted_restore_name, remaining_size);
+ }
+ else
+ remaining_size = 0; /* give some value to the variable */
+@@ -1188,23 +1197,24 @@
/* Start writing the pipe with encodes. */
FILE *outptr;
@@ -1469,214 +1490,117 @@
}
else
input = fopen (local_name, "rb");
-@@ -1215,17 +1225,17 @@
+@@ -1248,27 +1258,27 @@
+
if (check_existing_mode)
{
- fprintf (output, "\
--if test -f '%s' && test \"$first_param\" != -c; then\n",
+- fprintf (output, "if test -f '%s' && test \"$first_param\" != -c; then\n",
- restore_name);
-+if test -f %s && test \"$first_param\" != -c; then\n",
++ fprintf (output, "if test -f %s && test \"$first_param\" != -c; then\n",
+ quoted_restore_name);
if (query_user_mode)
{
- fprintf (output, "\
- case $shar_wish in\n\
- A*|a*)\n\
-- $echo 'x -' %s '%s' ;;\n\
-+ $echo 'x -' %s %s ;;\n\
- *)\n\
-- $echo $shar_n '? -' %s '%s' '%s' $shar_c\n\
-+ $echo $shar_n '? -' %s %s '%s' $shar_c\n\
- if test -n \"$shar_tty\"; then\n\
- read shar_wish < $shar_tty\n\
- else\n\
-@@ -1244,17 +1254,17 @@
- shar_skip=no\n\
- fi\n\
- if test $shar_skip = yes; then\n\
-- $echo 'x -' %s '%s'\n",
-- N_("overwriting"), restore_name,
-- N_("overwrite"), restore_name,
-+ $echo 'x -' %s %s\n",
-+ N_("overwriting"), quoted_restore_name,
-+ N_("overwrite"), quoted_restore_name,
- N_("[no, yes, all, quit] (no)?"),
- N_("extraction aborted"),
-- N_("SKIPPING"), restore_name);
-+ N_("SKIPPING"), quoted_restore_name);
+ char* pzOverwriting = scribble;
+ char* pzOverwrite;
+
+- sprintf (pzOverwriting, N_("overwriting %s"), restore_name);
++ sprintf (pzOverwriting, N_("overwriting '%s'"), quoted_restore_name);
+ pzOverwrite = scribble + strlen(pzOverwriting) + 2;
+- sprintf (pzOverwrite, N_("overwrite %s"), restore_name);
++ sprintf (pzOverwrite, N_("overwrite '%s'"), quoted_restore_name);
+
+ fprintf (output, query_user_z, pzOverwriting, pzOverwrite);
+
+- sprintf (pzOverwriting, N_("SKIPPING %s"), restore_name);
++ sprintf (pzOverwriting, N_("SKIPPING '%s'"), quoted_restore_name);
+ fprintf (output, query_check_z, N_("extraction aborted"),
+ pzOverwriting, pzOverwriting);
}
else
- fprintf (output, "\
-- $echo 'x -' %s '%s' '%s'\n",
-- N_("SKIPPING"), restore_name, N_("(file already exists)"));
-+ $echo 'x -' %s %s '%s'\n",
-+ N_("SKIPPING"), quoted_restore_name, N_("(file already exists)"));
+- echo_text (N_("SKIPPING %s (file already exists)"),
+- restore_name, 0);
++ echo_text (N_("SKIPPING '%s' (file already exists)"),
++ quoted_restore_name, 0);
if (split_file_mode)
- fprintf (output, "\
-@@ -1276,8 +1286,8 @@
+ fputs (" rm -f ${lock_dir}/new\nelse\n > ${lock_dir}/new\n", output);
+@@ -1281,8 +1291,8 @@
if (!quiet_unshar_mode)
- fprintf (output, "\
-- $echo 'x -' %s '%s' '%s'\n",
-- N_("extracting"), restore_name, file_type_remote);
-+ $echo 'x -' %s %s '%s'\n",
-+ N_("extracting"), quoted_restore_name, file_type_remote);
-
- if (struct_stat.st_size == 0)
{
-@@ -1285,8 +1295,8 @@
+- sprintf (scribble, N_("x - extracting %s %s"),
+- restore_name, file_type_remote);
++ sprintf (scribble, N_("x - extracting '%s' %s"),
++ quoted_restore_name, file_type_remote);
+ fprintf (output, echo_string_z, scribble);
+ }
+
+@@ -1291,8 +1301,8 @@
+
/* Just touch the file, or empty it if it exists. */
- fprintf (output, "\
-- > '%s' &&\n",
+- fprintf (output, " > '%s' &&\n",
- restore_name);
-+ > %s &&\n",
++ fprintf (output, " > %s &&\n",
+ quoted_restore_name);
}
else
{
-@@ -1312,8 +1322,8 @@
+@@ -1315,8 +1325,8 @@
+
/* Just run it into the file. */
- fprintf (output, "\
-- sed 's/^%c//' << '%s' > '%s' &&\n",
+- fprintf (output, " sed 's/^%c//' << '%s' > '%s' &&\n",
- line_prefix, here_delimiter, restore_name);
-+ sed 's/^%c//' << '%s' > %s &&\n",
++ fprintf (output, " sed 's/^%c//' << '%s' > %s &&\n",
+ line_prefix, here_delimiter, quoted_restore_name);
}
while (fgets (buffer, BUFSIZ, input))
-@@ -1394,8 +1404,8 @@
+@@ -1397,8 +1407,8 @@
failed. */
- fprintf (output, "\
-- : || $echo '%s' '%s' '%s'\n",
-- N_("restore of"), restore_name, N_("failed"));
-+ : || $echo '%s' %s '%s'\n",
-+ N_("restore of"), quoted_restore_name, N_("failed"));
+ fputs (" :\n", output);
+- echo_status ("test $? -ne 0", N_("restore of %s failed\n"), NULL,
+- restore_name, 0);
++ echo_status ("test $? -ne 0", N_("restore of '%s' failed\n"), NULL,
++ quoted_restore_name, 0);
if (check_existing_mode)
- fputs ("\
-@@ -1409,13 +1419,16 @@
- N_("continue with part"), part_number + 1);
- else
- fprintf (output, "\
--$echo '%s' '%s' '%s' '%d'\n\
--$echo '%s' '%s' '%s' '%d'\n",
-+$echo '%s' %s '%s' '%d'\n\
-+$echo '%s' %s '%s' '%d'\n",
- N_("End of"),
-- archive_name ? archive_name : N_("archive"),
-+ archive_name
-+ ? quotearg_n_style (2, shell_always_quoting_style,
-+ archive_name)
-+ : N_("archive"),
- N_("part"),
- part_number,
-- N_("File"), restore_name,
-+ N_("File"), quoted_restore_name,
- N_("is continued in part"), part_number + 1);
-
- fprintf (output, "\
-@@ -1491,25 +1504,25 @@
- else
- fprintf (output, "\
- if test ! -f _sh%05d/new; then\n\
-- $echo 'x -' '%s' '%s'\n\
-+ $echo 'x -' '%s' %s\n\
- else\n",
- sharpid,
-- N_("STILL SKIPPING"), restore_name);
-+ N_("STILL SKIPPING"), quoted_restore_name);
- }
-
- if (!quiet_mode)
- fprintf (stderr, _("Starting file %s\n"), output_filename);
- if (!quiet_unshar_mode)
- fprintf (output, "\
-- $echo 'x -' '%s' '%s'\n",
-- N_("continuing file"), restore_name);
-+ $echo 'x -' '%s' %s\n",
-+ N_("continuing file"), quoted_restore_name);
- fprintf (output, "\
- sed 's/^%c//' << '%s' >> ",
- line_prefix, here_delimiter);
- if (uuencoded_file_mode)
- fprintf (output, "_sh%05d/uue &&\n", sharpid);
- else
-- fprintf (output, "%s &&\n", restore_name);
-+ fprintf (output, "%s &&\n", quoted_restore_name);
- remaining_size = file_size_limit;
- split_flag = 1;
- }
-@@ -1522,8 +1535,8 @@
- fprintf (output, "%s\n", here_delimiter);
- if (split_flag && !quiet_unshar_mode)
- fprintf (output, "\
-- $echo '%s' '%s' '%s' &&\n",
-- N_("File"), restore_name, N_("is complete"));
-+ $echo '%s' %s '%s' &&\n",
-+ N_("File"), quoted_restore_name, N_("is complete"));
-
- /* If this file was uuencoded w/Split, decode it and drop the temp. */
-
-@@ -1531,8 +1544,8 @@
- {
+ fputs ("fi\n", output);
+@@ -1521,24 +1531,24 @@
if (!quiet_unshar_mode)
- fprintf (output, "\
-- $echo '%s' '%s' &&\n",
-- N_("uudecoding file"), restore_name);
-+ $echo '%s' %s &&\n",
-+ N_("uudecoding file"), quoted_restore_name);
-
- fprintf (output, "\
- uudecode _sh%05d/uue < _sh%05d/uue &&\n",
-@@ -1545,23 +1558,23 @@
- {
- if (!quiet_unshar_mode)
- fprintf (output, "\
-- $echo '%s' '%s' &&\n",
-- N_("uncompressing file"), restore_name);
-+ $echo '%s' %s &&\n",
-+ N_("uncompressing file"), quoted_restore_name);
-
- fprintf (output, "\
-- compress -d < _sh%05d/cmp > '%s' &&\n",
-- sharpid, restore_name);
-+ compress -d < _sh%05d/cmp > %s &&\n",
-+ sharpid, quoted_restore_name);
+ echo_text (N_("uncompressing file %s"), restore_name, 1);
+
+- fprintf (output, " compress -d < ${lock_dir}/cmp > '%s' &&\n",
+- restore_name);
++ fprintf (output, " compress -d < ${lock_dir}/cmp > %s &&\n",
++ quoted_restore_name);
}
else if (gzipped_file_mode)
{
if (!quiet_unshar_mode)
- fprintf (output, "\
-- $echo '%s' '%s' &&\n",
-- N_("gunzipping file"), restore_name);
-+ $echo '%s' %s &&\n",
-+ N_("gunzipping file"), quoted_restore_name);
-
- fprintf (output, "\
-- gzip -d < _sh%05d/gzi > '%s' &&\n",
-- sharpid, restore_name);
-+ gzip -d < _sh%05d/gzi > %s &&\n",
-+ sharpid, quoted_restore_name);
+ echo_text (N_("gunzipping file %s"), restore_name, 1);
+
+- fprintf (output, " gzip -d < ${lock_dir}/gzi > '%s' &&\n",
+- restore_name);
++ fprintf (output, " gzip -d < ${lock_dir}/gzi > %s &&\n",
++ quoted_restore_name);
}
else if (bzipped_file_mode)
{
-@@ -1571,8 +1584,8 @@
- N_("bunzipping file"), restore_name);
+ if (!quiet_unshar_mode)
+ echo_text (N_("bunzipping file %s"), restore_name, 1);
- fprintf (output, "\
-- bzip2 -d < _sh%05d/bzi > '%s' &&\n",
-- sharpid, restore_name);
-+ bzip2 -d < _sh%05d/bzi > %s &&\n",
-+ sharpid, quoted_restore_name);
+- fprintf (output, " bzip2 -d < ${lock_dir}/bzi > '%s' &&\n",
+- restore_name);
++ fprintf (output, " bzip2 -d < ${lock_dir}/bzi > %s &&\n",
++ quoted_restore_name);
}
}
-@@ -1583,12 +1596,12 @@
+@@ -1549,12 +1559,12 @@
restore_time = localtime (&struct_stat.st_mtime);
fprintf (output, "\
@@ -1691,37 +1615,36 @@
}
if (vanilla_operation_mode)
-@@ -1598,8 +1611,8 @@
+@@ -1563,8 +1573,8 @@
+ /* Close the "&&" and report an error if any of the above
failed. */
-
- fprintf (output, "\
-- : || $echo '%s' '%s' '%s'\n",
-- N_("restore of"), restore_name, N_("failed"));
-+ : || $echo '%s' %s '%s'\n",
-+ N_("restore of"), quoted_restore_name, N_("failed"));
+ fputs (":\n", output);
+- echo_status ("test $? -ne 0", N_("restore of %s failed"), NULL,
+- restore_name, 0);
++ echo_status ("test $? -ne 0", N_("restore of '%s' failed"), NULL,
++ quoted_restore_name, 0);
}
else
{
-@@ -1610,14 +1623,14 @@
+@@ -1574,13 +1584,13 @@
+
/* Set the permissions as they were. */
- fprintf (output, "\
-- chmod %04o '%s' ||\n",
+- fprintf (output, " chmod %04o '%s'\n",
- (unsigned) (struct_stat.st_mode & 0777), restore_name);
-+ chmod %04o %s ||\n",
++ fprintf (output, " chmod %04o %s\n",
+ (unsigned) (struct_stat.st_mode & 0777), quoted_restore_name);
/* Report an error if any of the above failed. */
- fprintf (output, "\
-- $echo '%s' '%s' '%s'\n",
-- N_("restore of"), restore_name, N_("failed"));
-+ $echo '%s' %s '%s'\n",
-+ N_("restore of"), quoted_restore_name, N_("failed"));
+- echo_status ("test $? -ne 0", N_("restore of %s failed"), NULL,
+- restore_name, 0);
++ echo_status ("test $? -ne 0", N_("restore of '%s' failed"), NULL,
++ quoted_restore_name, 0);
if (md5_count_mode && (fp = fopen (local_name, "r")) != NULL
&& md5_stream (fp, md5buffer) == 0)
-@@ -1626,7 +1639,7 @@
+@@ -1589,7 +1599,7 @@
size_t cnt;
did_md5 = 1;
@@ -1730,7 +1653,7 @@
N_("MD5 check failed"), here_delimiter);
for (cnt = 0; cnt < 16; ++cnt)
-@@ -1647,9 +1660,10 @@
+@@ -1609,9 +1619,10 @@
/* Validate the transferred file using simple `wc' command. */
FILE *pfp;
@@ -1738,44 +1661,58 @@
+ char *command = alloca (strlen (CHARACTER_COUNT_COMMAND)
+ + strlen (quoted_local_name) + 2);
-- sprintf (command, "%s '%s'", CHARACTER_COUNT_COMMAND, local_name);
+- sprintf (command, "LC_ALL=C wc -c < '%s'", local_name);
+ sprintf (command, "%s %s", CHARACTER_COUNT_COMMAND, quoted_local_name);
if (pfp = popen (command, "r"), pfp)
{
char wc[BUFSIZ];
-@@ -1683,12 +1697,12 @@
+@@ -1643,11 +1654,11 @@
}
- fprintf (output, "\
--%s shar_count=\"`%s '%s'`\"\n\
-+%s shar_count=\"`%s %s`\"\n\
- %s test %s -eq \"$shar_count\" ||\n\
--%s $echo '%s:' '%s' '%s,' '%s' \"$shar_count!\"\n",
-- prefix, CHARACTER_COUNT_COMMAND, restore_name,
-+%s $echo %s: '%s' '%s,' '%s' \"$shar_count!\"\n",
-+ prefix, CHARACTER_COUNT_COMMAND, quoted_restore_name,
- prefix, wc,
-- prefix, restore_name, N_("original size"), wc,
-+ prefix, quoted_restore_name, N_("original size"), wc,
- N_("current size"));
+ fprintf (output,
+- "test `LC_ALL=C wc -c < '%s'` -ne %s && \\\n ${echo} ",
+- restore_name, wc);
++ "test `LC_ALL=C wc -c < %s` -ne %s && \\\n ${echo} ",
++ quoted_restore_name, wc);
+ fprintf (output,
+- N_("'restoration warning: size of %s is not %s'\n"),
+- restore_name, wc);
++ N_("'restoration warning: size of '%s' is not %s'\n"),
++ quoted_restore_name, wc);
pclose (pfp);
}
+ }
--- tests/shar-1.ok
+++ tests/shar-1.ok
-@@ -113,14 +113,14 @@
- $echo 'restore of' 'shar-1.in' 'failed'
+@@ -94,26 +94,26 @@
+ fi
+ # ============= shar-1.in ==============
+ if test -f 'shar-1.in' && test "$first_param" != -c; then
+- ${echo} 'x -SKIPPING shar-1.in (file already exists)'
++ ${echo} 'x -SKIPPING ''shar-1.in'' (file already exists)'
+ else
+-${echo} 'x - extracting shar-1.in (text)'
++${echo} 'x - extracting ''shar-1.in'' (text)'
+ sed 's/^X//' << 'SHAR_EOF' > 'shar-1.in' &&
+ This is a test
+ SHAR_EOF
+ (set <date> 'shar-1.in'; eval "$shar_touch") &&
+ chmod 0644 'shar-1.in'
+ if test $? -ne 0
+-then ${echo} 'restore of shar-1.in failed'
++then ${echo} 'restore of ''shar-1.in'' failed'
+ fi
if ${md5check}
then (
-- ${MD5SUM} -c >/dev/null 2>&1 || ${echo} 'shar-1.in:' 'MD5 check failed'
+- ${MD5SUM} -c >/dev/null 2>&1 || ${echo} 'shar-1.in: MD5 check failed'
+ ${MD5SUM} -c >/dev/null 2>&1 || ${echo} 'shar-1.in': 'MD5 check failed'
) << SHAR_EOF
ff22941336956098ae9a564289d1bf1b shar-1.in
SHAR_EOF
else
- shar_count="`LC_ALL=C wc -c < 'shar-1.in'`"
- test 15 -eq "$shar_count" ||
-- $echo 'shar-1.in:' 'original size' '15,' 'current size' "$shar_count!"
-+ $echo 'shar-1.in': 'original size' '15,' 'current size' "$shar_count!"
+ test `LC_ALL=C wc -c < 'shar-1.in'` -ne 15 && \
+- ${echo} 'restoration warning: size of shar-1.in is not 15'
++ ${echo} 'restoration warning: size of ''shar-1.in'' is not 15'
fi
fi
- $echo $shar_n 'x -' 'lock directory' "\`_sh<PID>': " $shar_c
+ if rm -fr ${lock_dir}
++++++ sharutils-4.6.tar.bz2 -> sharutils-4.6.2.tar.bz2 ++++++
++++ 31954 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...