[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.11-83-gb9ace68

[Mark H Weaver]

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

The branch, stable-2.0 has been updated
       via  b9ace68613395fda26f3f3d7dc2ac9bc52cd7f2a (commit)
      from  6b47249a28c7725714ee0e356d3d4b01dfc96aa2 (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 b9ace68613395fda26f3f3d7dc2ac9bc52cd7f2a
Author: Mark H Weaver <address@hidden>
Date:   Fri Oct 10 22:36:54 2014 -0400

    scm_boot_guile: Gracefully handle the case where argc == 0.
    
    Fixes <http://bugs.gnu.org/18680>.
    Reported by Nala Ginrut <address@hidden>.
    
    * libguile/init.c (scm_boot_guile): Do not canonicalize argv[0] unless
      argc > 0.
    * THANKS: Add Nala Ginrut to the fixes section.

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

Summary of changes:
 THANKS          |    1 +
 libguile/init.c |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/THANKS b/THANKS
index fa99633..1aeb4a4 100644
--- a/THANKS
+++ b/THANKS
@@ -86,6 +86,7 @@ For fixes or providing information which led to a fix:
          Andrew Gaylard
            Nils Gey
            Eric Gillespie, Jr
+           Nala Ginrut
          Didier Godefroy
   Panicz Maciej Godek
            John Goerzen
diff --git a/libguile/init.c b/libguile/init.c
index f558413..1348c2d 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -1,6 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- *   2004, 2006, 2009, 2010, 2011, 2012, 2013,
- *   2014 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2004, 2006, 2009-2014 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
@@ -314,7 +312,9 @@ scm_boot_guile (int argc, char ** argv, void (*main_func) 
(), void *closure)
 
   /* On Windows, convert backslashes in argv[0] to forward
      slashes.  */
-  scm_i_mirror_backslashes (argv[0]);
+  if (argc > 0)
+    scm_i_mirror_backslashes (argv[0]);
+
   c.main_func = main_func;
   c.closure = closure;
   c.argc = argc;


hooks/post-receive
-- 
GNU Guile