[sharutils] Fix decoding from positional argument while overriding output file

[Petr Pisar]

commit b844ed00a2d77b5ef5e0c06f8cfb5b8529e8edfe
Author: Petr Písař <ppisar at redhat.com>
Date:   Wed Jan 23 13:23:15 2013 +0100

    Fix decoding from positional argument while overriding output file

 ...ly-one-input-file-when-specifying-output-.patch |   36 ++++++++++++++++++++
 sharutils.spec                                     |    9 ++++-
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/sharutils-4.13.3-Allow-exactly-one-input-file-when-specifying-output-.patch b/sharutils-4.13.3-Allow-exactly-one-input-file-when-specifying-output-.patch
new file mode 100644
index 0000000..1a57c33
--- /dev/null
+++ b/sharutils-4.13.3-Allow-exactly-one-input-file-when-specifying-output-.patch
@@ -0,0 +1,36 @@
+From 2e633b222dbdccfd04506a0c0028471feb101524 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 23 Jan 2013 13:15:18 +0100
+Subject: [PATCH] Allow exactly one input file when specifying output file
+
+This fixes regression in 4.13.3. The fix ported from 4.13.4pre2.
+<https://bugzilla.redhat.com/show_bug.cgi?id=901895>
+---
+ src/uudecode.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/uudecode.c b/src/uudecode.c
+index 2ef5a92..723bcff 100644
+--- a/src/uudecode.c
++++ b/src/uudecode.c
+@@ -490,7 +490,7 @@ main (int argc, char const * const * argv)
+     exit_status = decode ("stdin");
+     break;
+ 
+-  case 1:
++  default:
+     if (HAVE_OPT(OUTPUT_FILE))
+       {
+         usage_message(_("You cannot specify an output file when processing\n\
+@@ -499,7 +499,7 @@ multiple input files.\n"));
+       }
+     /* FALLTHROUGH */
+ 
+-  default:
++  case 1:
+     while (--argc >= 0)
+       {
+         char const * f = *(argv++);
+-- 
+1.8.1
+
diff --git a/sharutils.spec b/sharutils.spec
index e9fe513..8c0ac36 100644
--- a/sharutils.spec
+++ b/sharutils.spec
@@ -1,11 +1,13 @@
 Summary: The GNU shar utilities for packaging and unpackaging shell archives
 Name: sharutils
 Version: 4.13.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+ and LGPLv2+ and Public Domain
 Group: Applications/Archiving
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
 URL: http://www.gnu.org/software/%{name}/
+# Bug #901895, in upstream 4.13.4pre2
+Patch0: %{name}-4.13.3-Allow-exactly-one-input-file-when-specifying-output-.patch
 BuildRequires: gettext
 Requires(post): info
 Requires(preun): info
@@ -26,6 +28,7 @@ shar files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .input_count
 
 # convert TODO, THANKS to UTF-8
 for i in TODO THANKS; do
@@ -65,6 +68,10 @@ fi
 %{_mandir}/man5/*
 
 %changelog
+* Wed Jan 23 2013 Petr Pisar <ppisar at redhat.com> - 4.13.3-2
+- Fix decoding from positional argument while overriding output file
+  (bug #901895)
+
 * Mon Jan 07 2013 Petr Pisar <ppisar at redhat.com> - 4.13.3-1
 - 4.13.3 bump