[Qemu-devel] [PATCH 3/5] util: allow \n to terminate password input

2015-05-12 Thread Daniel P. Berrange
The qemu_read_password() method looks for \r to terminate the
reading of the a password. This is what will be seen when
reading the password from a TTY. When scripting though, it is
useful to be able to send the password via a pipe, in which
case we must look for \n to terminate password input.

Signed-off-by: Daniel P. Berrange berra...@redhat.com
---
 util/oslib-posix.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 1c23fd2..3ae4987 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -467,7 +467,8 @@ int qemu_read_password(char *buf, int buf_size)
 ret = -1;
 break;
 } else {
-if (ch == '\r') {
+if (ch == '\r' ||
+ch == '\n') {
 ret = 0;
 break;
 }
-- 
2.1.0




Re: [Qemu-devel] [PATCH 3/5] util: allow \n to terminate password input

2015-05-12 Thread Eric Blake
On 05/12/2015 10:09 AM, Daniel P. Berrange wrote:
 The qemu_read_password() method looks for \r to terminate the
 reading of the a password. This is what will be seen when
 reading the password from a TTY. When scripting though, it is
 useful to be able to send the password via a pipe, in which
 case we must look for \n to terminate password input.
 
 Signed-off-by: Daniel P. Berrange berra...@redhat.com
 ---
  util/oslib-posix.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 

Reviewed-by: Eric Blake ebl...@redhat.com

-- 
Eric Blake   eblake redhat com+1-919-301-3266
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature