diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-10-16 02:34:18 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-10-17 21:38:43 -0400 |
| commit | c2a654b7d29f5e2f32fd1313cc80162fd0c8f992 (patch) | |
| tree | b7d3afb6adec15951465ad37ad2242017905a52a /libguile/posix.c | |
| parent | 3845343cf33b6fb81c772a65e238c5377668789d (diff) | |
| download | guile-c2a654b7d29f5e2f32fd1313cc80162fd0c8f992.tar.gz | |
Use 'scm_from_utf8_{string,symbol,keyword}' for C string literals.
Partial fix for <https://bugs.gnu.org/33044>.
Reported by Tom de Vries <tdevries@suse.de>.
Fix several instances of the mistake of using 'scm_from_locale_*' for C
strings that originally came from a C string literal. Change several
uses of 'scm_from_latin1_*' as well, to promote the practice of writing
code that works for arbitrary C string literals.
Also add missing years to the copyright notices of changed files, based
on the git history.
* libguile/debug-malloc.c, libguile/deprecation.c, libguile/error.c,
libguile/eval.c, libguile/expand.c, libguile/extensions.c,
libguile/filesys.c, libguile/init.c, libguile/load.c,
libguile/modules.c, libguile/pairs.c, libguile/posix.c,
libguile/print.c, libguile/random.c, libguile/read.c,
libguile/regex-posix.c, libguile/snarf.h, libguile/srfi-13.c,
libguile/stacks.c, libguile/stime.c, libguile/strports.c,
libguile/values.c: Use 'scm_from_utf8_*' where appropriate.
Diffstat (limited to 'libguile/posix.c')
| -rw-r--r-- | libguile/posix.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libguile/posix.c b/libguile/posix.c index d8200926d..7ede7b756 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -1,6 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - * 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, - * 2014, 2016, 2017, 2018 Free Software Foundation, Inc. +/* Copyright (C) 1995-2014, 2016-2018 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 @@ -372,11 +370,11 @@ SCM_DEFINE (scm_getpwuid, "getpw", 0, 1, 0, SCM_SIMPLE_VECTOR_SET(result, 3, scm_from_ulong (entry->pw_gid)); SCM_SIMPLE_VECTOR_SET(result, 4, scm_from_locale_string (entry->pw_gecos)); if (!entry->pw_dir) - SCM_SIMPLE_VECTOR_SET(result, 5, scm_from_locale_string ("")); + SCM_SIMPLE_VECTOR_SET(result, 5, scm_from_utf8_string ("")); else SCM_SIMPLE_VECTOR_SET(result, 5, scm_from_locale_string (entry->pw_dir)); if (!entry->pw_shell) - SCM_SIMPLE_VECTOR_SET(result, 6, scm_from_locale_string ("")); + SCM_SIMPLE_VECTOR_SET(result, 6, scm_from_utf8_string ("")); else SCM_SIMPLE_VECTOR_SET(result, 6, scm_from_locale_string (entry->pw_shell)); return result; |