[Xen-changelog] [xen-3.2-testing] figlet: Fix handling of full final line of octal output.

["Xen patchbot-3.2-testing" <patchbot-3.2-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1208937766 -3600
# Node ID 872282b8c11a5dfad51822485d0b937dd8cb9439
# Parent  ae3949e86e9e62782b93e2b230404397a286d36e
figlet: Fix handling of full final line of octal output.
It should not be terminated with a backslash.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   17502:4f9284a5d3ab4fb402e6838f39fb2e43ee833779
xen-unstable date:        Wed Apr 23 09:02:15 2008 +0100
---
 xen/tools/figlet/figlet.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff -r ae3949e86e9e -r 872282b8c11a xen/tools/figlet/figlet.c
--- a/xen/tools/figlet/figlet.c Tue Apr 22 12:01:25 2008 +0100
+++ b/xen/tools/figlet/figlet.c Wed Apr 23 09:02:46 2008 +0100
@@ -1488,18 +1488,7 @@ static void myputchar(unsigned char c)
 
     putc(c, stderr);
 
-    if ( nr_chars == 0 )
-        putchar('"');
-
-    putchar('\\');
-    putchar('0' + ((c>>6)&7));
-    putchar('0' + ((c>>3)&7));
-    putchar('0' + ((c>>0)&7));
-
-    if ( c == '\n' )
-        startline = 1;
-
-    if ( ++nr_chars == 18 ) 
+    if ( nr_chars == 18 ) 
     {
         nr_chars = 0;
         putchar('"');
@@ -1507,6 +1496,17 @@ static void myputchar(unsigned char c)
         putchar('\\');
         putchar('\n');
     }
+
+    if ( nr_chars++ == 0 )
+        putchar('"');
+
+    putchar('\\');
+    putchar('0' + ((c>>6)&7));
+    putchar('0' + ((c>>3)&7));
+    putchar('0' + ((c>>0)&7));
+
+    if ( c == '\n' )
+        startline = 1;
 }
 
 void putstring(string)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog