[Guile-commits] GNU Guile branch, master, updated. release_1-9-12-65-g3fa8822

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=3fa882203aefb68c00ebd28ca8b9ed6988e7a1ad

The branch, master has been updated
       via  3fa882203aefb68c00ebd28ca8b9ed6988e7a1ad (commit)
      from  e7bee747712be9ee98f4f739cc1b52df8fd7dcd8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3fa882203aefb68c00ebd28ca8b9ed6988e7a1ad
Author: Ludovic Courtès <address@hidden>
Date:   Thu Sep 23 22:34:31 2010 +0200

    Fix bug #31081 (`lookahead-u8' returns an s8.)
    
    Reported by Göran Weinholt <address@hidden>.
    
    * libguile/r6rs-ports.c (scm_lookahead_u8): Return an unsigned byte.
    
    * test-suite/tests/r6rs-ports.test ("7.2.8 Binary Input")["lookahead-u8:
      result is unsigned"]: New test.

-----------------------------------------------------------------------

Summary of changes:
 THANKS                           |    1 +
 libguile/r6rs-ports.c            |    4 ++--
 test-suite/tests/r6rs-ports.test |    5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/THANKS b/THANKS
index 9e18e59..3ee51e7 100644
--- a/THANKS
+++ b/THANKS
@@ -130,6 +130,7 @@ For fixes or providing information which led to a fix:
         Michael Tuexen
          Thomas Wawrzinek
         Mark H. Weaver
+          Göran Weinholt
             Jon Wilson
            Andy Wingo
           Keith Wright
diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index 6ad320a..9576db8 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2009, 2010 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -447,7 +447,7 @@ SCM_DEFINE (scm_lookahead_u8, "lookahead-u8", 1, 0, 0,
 
   result = scm_peek_char (port);
   if (SCM_CHARP (result))
-    result = SCM_I_MAKINUM ((signed char) SCM_CHAR (result));
+    result = SCM_I_MAKINUM ((unsigned char) SCM_CHAR (result));
   else
     result = SCM_EOF_VAL;
 
diff --git a/test-suite/tests/r6rs-ports.test b/test-suite/tests/r6rs-ports.test
index 0b627da..7d80ed7 100644
--- a/test-suite/tests/r6rs-ports.test
+++ b/test-suite/tests/r6rs-ports.test
@@ -52,6 +52,11 @@
            (= (char->integer #\A) (get-u8 port))
            (eof-object? (get-u8 port)))))
 
+  (pass-if "lookahead-u8: result is unsigned"
+    ;; Bug #31081.
+    (let ((port (open-bytevector-input-port #vu8(255))))
+      (= (lookahead-u8 port) 255)))
+
   (pass-if "get-bytevector-n [short]"
     (let* ((port (open-input-string "GNU Guile"))
            (bv (get-bytevector-n port 4)))


hooks/post-receive
-- 
GNU Guile