[Libguestfs] [PATCH] base64-in: Ignore garbage characters in input.

[Richard W.M. Jones]

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
New in Fedora 11: Fedora Windows cross-compiler. Compile Windows
programs, test, and build Windows installers. Over 70 libraries supprt'd
http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw
-------------- next part --------------
>From 150c52cdc78f6165e05261d63ee08f4e5af0984a Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at redhat.com>
Date: Wed, 2 Jun 2010 15:10:38 +0100
Subject: [PATCH] base64-in: Ignore garbage characters in input.

On RHEL 5 you have to specify the -i option to get the
external 'base64' command to ignore \n characters.  (The
Fedora version seems to ignore these characters anyway).

Add this option so the tests can pass on RHEL 5.
---
 daemon/base64.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/daemon/base64.c b/daemon/base64.c
index 89bf437..1d2d1d0 100644
--- a/daemon/base64.c
+++ b/daemon/base64.c
@@ -42,7 +42,7 @@ do_base64_in (const char *file)
   FILE *fp;
   char *cmd;
 
-  if (asprintf_nowarn (&cmd, "base64 -d > %R", file) == -1) {
+  if (asprintf_nowarn (&cmd, "base64 -d -i > %R", file) == -1) {
     err = errno;
     cancel_receive ();
     errno = err;
-- 
1.6.6.1