[Guile-commits] GNU Guile branch, master, updated. release_1-9-6-156-ga8fc385

[Andy Wingo]

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=a8fc38526a3e8fb9fef00042e1acc5b4a80b3f3f

The branch, master has been updated
       via  a8fc38526a3e8fb9fef00042e1acc5b4a80b3f3f (commit)
       via  bd4b6c1a83a857f48e63fd64c276c77457c41bca (commit)
       via  e744e076fae41492fb990bc32594d9daf2908094 (commit)
      from  6ea3048785915947a24305f0cff88f7b903182a0 (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 a8fc38526a3e8fb9fef00042e1acc5b4a80b3f3f
Author: Andy Wingo <address@hidden>
Date:   Wed Jan 13 21:08:54 2010 +0100

    remove unused var in read.c
    
    * libguile/read.c (scm_read_character): Remove unused var.

commit bd4b6c1a83a857f48e63fd64c276c77457c41bca
Author: Thien-Thi Nguyen <address@hidden>
Date:   Wed Jan 13 09:49:44 2010 +0100

    Use `mkstemp' instead of `mktemp'.
    
    * test-suite/standalone/test-unwind.c (check_ports):
    Use `mkstemp' instead of `mktemp'.
    
    Signed-off-by: Thien-Thi Nguyen <address@hidden>

commit e744e076fae41492fb990bc32594d9daf2908094
Author: Thien-Thi Nguyen <address@hidden>
Date:   Sat Jan 9 10:07:48 2010 +0100

    Update configure script hints wrt precious env vars.
    
    * README: Don't suggest setting vars before running configure.
    Instead, suggest specifying them on the configure command-line.
    
    Signed-off-by: Thien-Thi Nguyen <address@hidden>

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

Summary of changes:
 README                              |   21 ++++++++++++---------
 libguile/read.c                     |    3 +--
 test-suite/standalone/test-unwind.c |    4 +++-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/README b/README
index 5669ce8..ea68081 100644
--- a/README
+++ b/README
@@ -50,16 +50,19 @@ names (where that is supported), makes it impossible to 
later move the
 built executables and libraries to an installation location other than
 the one that was specified at build time.
 
-Another possible approach is to set CPPFLAGS and LDFLAGS before
-running configure, so that they include -I options for all the
+Another possible approach is to set CPPFLAGS and LDFLAGS on the
+configure command-line, so that they include -I options for all the
 non-standard places where you have installed header files and -L
 options for all the non-standard places where you have installed
 libraries.  This will allow configure and make to find those headers
-and libraries during the build.  The locations found will not be
-hardcoded into the build executables and libraries, so with this
-approach you will probably also need to set LD_LIBRARY_PATH
-correspondingly, to allow Guile to find the necessary libraries again
-at runtime.
+and libraries during the build.  E.g.:
+
+  ../configure [...] CPPFLAGS='-I/my/include' LDFLAGS='-L/my/lib'
+
+The locations found will not be hardcoded into the build executables and
+libraries, so with this approach you will probably also need to set
+LD_LIBRARY_PATH correspondingly, to allow Guile to find the necessary
+libraries again at runtime.
 
 
 Required External Packages ================================================
@@ -93,8 +96,8 @@ Guile requires the following external packages:
     Guile's ./configure script uses pkg-config to discover the correct
     compile and link options for libgc.  If you don't have pkg-config
     installed, or you have a version of libgc that doesn't provide a
-    .pc file, you can work around this by setting some environment
-    variables before running ./configure:
+    .pc file, you can work around this by setting some variables as
+    part of the configure command-line:
 
     - PKG_CONFIG=true
 
diff --git a/libguile/read.c b/libguile/read.c
index c209669..edcb6ed 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1999,2000,2001,2003, 2004, 2006, 2007, 2008, 
2009 Free Software
+/* Copyright (C) 1995,1996,1997,1999,2000,2001,2003, 2004, 2006, 2007, 2008, 
2009, 2010 Free Software
  * Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
@@ -847,7 +847,6 @@ scm_read_character (scm_t_wchar chr, SCM port)
   if (cp == 'x' && (charname_len > 1) && SCM_R6RS_ESCAPES_P)
     {
       SCM p;
-      scm_t_wchar chr;
       
       /* Convert from hex, skipping the initial 'x' character in CHARNAME */
       p = scm_string_to_number (scm_c_substring (charname, 1, charname_len),
diff --git a/test-suite/standalone/test-unwind.c 
b/test-suite/standalone/test-unwind.c
index f9820cc..f333c8c 100644
--- a/test-suite/standalone/test-unwind.c
+++ b/test-suite/standalone/test-unwind.c
@@ -210,7 +210,9 @@ check_ports ()
   strcpy (filename, tmpdir);
   strcat (filename, FILENAME_TEMPLATE);
 
-  if (mktemp (filename) == NULL)
+  /* Sanity check: Make sure that `filename' is actually writeable.
+     We used to use mktemp(3), but that is now considered a security risk.  */
+  if (0 > mkstemp (filename))
     exit (1);
 
   scm_dynwind_begin (0);


hooks/post-receive
-- 
GNU Guile