From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 13 Jun 2012 09:11:27 +0000 (+0200)
Subject: virsh: Honor reedit opts printing to a function
X-Git-Tag: v0.9.13-rc1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b00469b61522db5cae4debc9041fb1fc6b6746f8;p=thirdparty%2Flibvirt.git

virsh: Honor reedit opts printing to a function

When printing reedit options we make stdin raw. However,
this results in stdout being raw as well. Therefore we need
to return carriage when doing new line. Unfortunately,
'\r' cannot be part of internationalized messages hence
we must move them to formatting string which then in turn
become huge and disarranged. To solve this, a new function
is introduced which takes variable string arguments and
prepend each with "\r\n" just before printing.
---

diff --git a/tools/virsh.c b/tools/virsh.c
index 18625009ce..6077d84b32 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -655,6 +655,19 @@ vshReconnect(vshControl *ctl)
     ctl->useSnapshotOld = false;
 }
 
+static void
+vshPrintRaw(vshControl *ctl, ...)
+{
+    va_list ap;
+    char *key;
+
+    va_start(ap, ctl);
+    while ((key = va_arg(ap, char *)) != NULL) {
+        vshPrint(ctl, "%s\r\n", key);
+    }
+    va_end(ap);
+}
+
 /**
  * vshAskReedit:
  * @msg: Question to ask user
@@ -690,10 +703,13 @@ vshAskReedit(vshControl *ctl, const char *msg)
         c = c_tolower(getchar());
 
         if (c == '?') {
-            vshPrint(ctl, "\r\n%s", _("y - yes, start editor again\n"
-                                      "n - no, throw away my changes\n"
-                                      "f - force, try to redefine again\n"
-                                      "? - print this help\n"));
+            vshPrintRaw(ctl,
+                        "",
+                        _("y - yes, start editor again"),
+                        _("n - no, throw away my changes"),
+                        _("f - force, try to redefine again"),
+                        _("? - print this help"),
+                        NULL);
             continue;
         } else if (c == 'y' || c == 'n' || c == 'f') {
             break;