diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-12-15 01:23:23 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-12-15 01:31:23 +0100 |
| commit | ed4c3739668b4b111b38555b8bc101cb74c87c1c (patch) | |
| tree | bebdd170764e27c853187118cf36d79fec78697c /libguile/script.h | |
| parent | c2c2b5a49b1ce37a42417037c3515864a808e53b (diff) | |
| download | guile-ed4c3739668b4b111b38555b8bc101cb74c87c1c.tar.gz | |
Arrange to convert command-line arguments from the right encoding.
This is a temporary workaround for the 2.0 stable series. The next
stable series should have an implicit `setlocale (LC_ALL, "")' call,
which will make this unnecessary.
* libguile/feature.c (progargs_fluid): Rename to...
(scm_program_arguments_fluid): ... this. Update users.
* libguile/feature.h (scm_program_arguments_fluid): New internal
declaration.
* libguile/init.c (invoke_main_func): Call
`scm_i_set_boot_program_arguments' instead of
`scm_set_program_arguments'.
* libguile/script.c (locale_arguments_to_string_list,
scm_i_set_boot_program_arguments): New functions.
(scm_compile_shell_switches): Use `locale_arguments_to_string_list'.
* libguile/script.h (scm_i_set_boot_program_arguments): New internal
declaration.
* test-suite/standalone/Makefile.am (check_SCRIPTS, TESTS): Add
`test-command-line-encoding'.
* test-suite/standalone/test-command-line-encoding: New file.
Diffstat (limited to 'libguile/script.h')
| -rw-r--r-- | libguile/script.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libguile/script.h b/libguile/script.h index 7e3828aa3..cf0162a40 100644 --- a/libguile/script.h +++ b/libguile/script.h @@ -3,7 +3,7 @@ #ifndef SCM_SCRIPT_H #define SCM_SCRIPT_H -/* Copyright (C) 1997,1998,2000, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1997,1998,2000, 2006, 2008, 2011 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 @@ -37,6 +37,7 @@ SCM_API void scm_shell_usage (int fatal, char *message); SCM_API SCM scm_compile_shell_switches (int argc, char **argv); SCM_API void scm_shell (int argc, char **argv); SCM_API char *scm_usage_name; +SCM_INTERNAL void scm_i_set_boot_program_arguments (int argc, char *argv[]); SCM_INTERNAL void scm_init_script (void); #endif /* SCM_SCRIPT_H */ |