[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-207-ga9ea4f9

[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=a9ea4f909b9970c755b0a7c4cd9da907e66496fc

The branch, stable-2.0 has been updated
       via  a9ea4f909b9970c755b0a7c4cd9da907e66496fc (commit)
       via  e5029c585382471f81717f8e1539854d90579512 (commit)
       via  5f24f1b53ed2c1746670ae8828a05cc7b63354e8 (commit)
      from  1ea37620c2c1794f7685b312d2530676a078ada7 (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 a9ea4f909b9970c755b0a7c4cd9da907e66496fc
Author: Ludovic Courtès <address@hidden>
Date:   Mon Mar 18 22:28:23 2013 +0100

    Avoid rebuild of `guile.info' at the user's site.
    
    * configure.ac: Remove `doc/ref/effective-version.texi' from the
      `AC_CONFIG_FILES'.
    * doc/ref/Makefile.am ($(srcdir)/effective-version.texi): New target.

commit e5029c585382471f81717f8e1539854d90579512
Author: Ludovic Courtès <address@hidden>
Date:   Mon Mar 18 21:31:50 2013 +0100

    Use byte-oriented functions in `get-bytevector*'.
    
    * libguile/r6rs-ports.c (scm_get_bytevector_some, scm_get_bytevector_n,
      scm_get_bytevector_n_x, scm_get_bytevector_all): Use
      `scm_get_byte_or_eof' and `scm_peek_byte_or_eof' instead of their
      `char' counterparts.
      Reported by Chris K. Jester-Young.

commit 5f24f1b53ed2c1746670ae8828a05cc7b63354e8
Author: Ludovic Courtès <address@hidden>
Date:   Mon Mar 18 21:28:05 2013 +0100

    Define the new Linux-specific `SO_REUSEPORT'.
    
    * libguile/socket.c (scm_init_socket)[SO_REUSEPORT]: Define
      `SO_REUSEPORT'.
      (scm_setsockopt, scm_getsockopt): Update docstring.
    * doc/ref/posix.texi (Network Sockets and Communication): List
      `SO_REUSEPORT'.

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

Summary of changes:
 configure.ac          |    1 -
 doc/ref/Makefile.am   |    7 +++++++
 doc/ref/posix.texi    |    1 +
 libguile/r6rs-ports.c |   16 +++++++++-------
 libguile/socket.c     |    5 +++++
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index af6afcc..42de733 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1635,7 +1635,6 @@ AC_CONFIG_FILES([
 
 AC_CONFIG_FILES([meta/guile-2.0.pc])
 AC_CONFIG_FILES([meta/guile-2.0-uninstalled.pc])
-AC_CONFIG_FILES([doc/ref/effective-version.texi])
 
 GUILE_CONFIG_SCRIPT([check-guile])
 GUILE_CONFIG_SCRIPT([benchmark-guile])
diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
index 4b1706e..d0ea94d 100644
--- a/doc/ref/Makefile.am
+++ b/doc/ref/Makefile.am
@@ -123,6 +123,13 @@ autoconf-macros.texi: $(top_srcdir)/meta/guile.m4
          snarf-guile-m4-docs $(top_srcdir)/meta/guile.m4 \
          > $(srcdir)/$@
 
+# Build that file from here rather than at the user's site to avoid
+# triggering a rebuild of `guile.info'.  Note that `GUILE-VERSION' is
+# among $(CONFIG_STATUS_DEPENDENCIES); thus, when it's updated, this
+# Makefile is rebuilt, and $(GUILE_EFFECTIVE_VERSION) is up-to-date.
+$(srcdir)/effective-version.texi: $(top_srcdir)/GUILE-VERSION
+       echo "@set EFFECTIVE-VERSION $(GUILE_EFFECTIVE_VERSION)" > $@
+
 MAINTAINERCLEANFILES = autoconf-macros.texi
 
 www-commit: html
diff --git a/doc/ref/posix.texi b/doc/ref/posix.texi
index 18aadca..d659cf3 100644
--- a/doc/ref/posix.texi
+++ b/doc/ref/posix.texi
@@ -3051,6 +3051,7 @@ Manual}, or @command{man 7 socket}.
 @defvarx SO_OOBINLINE
 @defvarx SO_NO_CHECK
 @defvarx SO_PRIORITY
address@hidden SO_REUSEPORT
 The @var{value} taken or returned is an integer.
 @end defvar
 
diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index e867429..d5fcd20 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2009, 2010, 2011, 2013 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
@@ -498,7 +498,7 @@ SCM_DEFINE (scm_get_bytevector_n, "get-bytevector-n", 2, 0, 
0,
 
   if ((c_read == 0) && (c_count > 0))
     {
-      if (SCM_EOF_OBJECT_P (scm_peek_char (port)))
+      if (scm_peek_byte_or_eof (port) == EOF)
        result = SCM_EOF_VAL;
       else
        result = scm_null_bytevector;
@@ -545,7 +545,7 @@ SCM_DEFINE (scm_get_bytevector_n_x, "get-bytevector-n!", 4, 
0, 0,
 
   if ((c_read == 0) && (c_count > 0))
     {
-      if (SCM_EOF_OBJECT_P (scm_peek_char (port)))
+      if (scm_peek_byte_or_eof (port) == EOF)
        result = SCM_EOF_VAL;
       else
        result = SCM_I_MAKINUM (0);
@@ -593,15 +593,17 @@ SCM_DEFINE (scm_get_bytevector_some, 
"get-bytevector-some", 1, 0, 0,
        }
 
       /* We can't use `scm_c_read ()' since it blocks.  */
-      c_chr = scm_getc (port);
+      c_chr = scm_get_byte_or_eof (port);
       if (c_chr != EOF)
        {
          c_bv[c_total] = (char) c_chr;
          c_total++;
        }
     }
-  while ((scm_is_true (scm_char_ready_p (port)))
-        && (!SCM_EOF_OBJECT_P (scm_peek_char (port))));
+  /* XXX: We want to check for the availability of a byte, but that's
+     what `scm_char_ready_p' actually does.  */
+  while (scm_is_true (scm_char_ready_p (port))
+        && (scm_peek_byte_or_eof (port) != EOF));
 
   if (c_total == 0)
     {
@@ -660,7 +662,7 @@ SCM_DEFINE (scm_get_bytevector_all, "get-bytevector-all", 
1, 0, 0,
       c_read = scm_c_read (port, c_bv + c_total, c_count);
       c_total += c_read, c_count -= c_read;
     }
-  while (!SCM_EOF_OBJECT_P (scm_peek_char (port)));
+  while (scm_peek_byte_or_eof (port) != EOF);
 
   if (c_total == 0)
     {
diff --git a/libguile/socket.c b/libguile/socket.c
index bed069b..fd5bea8 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -510,6 +510,7 @@ SCM_DEFINE (scm_getsockopt, "getsockopt", 3, 0, 0,
            "@defvarx SO_OOBINLINE\n"
            "@defvarx SO_NO_CHECK\n"
            "@defvarx SO_PRIORITY\n"
+           "@defvarx SO_REUSEPORT\n"
            "The value returned is an integer.\n"
            "@end defvar\n"
            "\n"
@@ -608,6 +609,7 @@ SCM_DEFINE (scm_setsockopt, "setsockopt", 4, 0, 0,
            "@defvarx SO_OOBINLINE\n"
            "@defvarx SO_NO_CHECK\n"
            "@defvarx SO_PRIORITY\n"
+           "@defvarx SO_REUSEPORT\n"
            "@var{value} is an integer.\n"
            "@end defvar\n"
            "\n"
@@ -1856,6 +1858,9 @@ scm_init_socket ()
 #ifdef SO_LINGER
   scm_c_define ("SO_LINGER", scm_from_int (SO_LINGER));
 #endif
+#ifdef SO_REUSEPORT                              /* new in Linux 3.9 */
+  scm_c_define ("SO_REUSEPORT", scm_from_int (SO_REUSEPORT));
+#endif
 
   /* recv/send options.  */
 #ifdef MSG_DONTWAIT


hooks/post-receive
-- 
GNU Guile