diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-12-08 09:19:51 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-12-08 09:19:51 -0800 |
| commit | 5745a7df2b4abe06d032820f6ec7ddbac9ad5028 (patch) | |
| tree | 5deecfc1b7b7c789abf9df72c177380d2cbef905 /admin | |
| parent | c56efa40745336c8067f047fe8f736821ddb3791 (diff) | |
| download | emacs-5745a7df2b4abe06d032820f6ec7ddbac9ad5028.tar.gz | |
Use putenv+unsetenv instead of modifying environ directly.
* admin/merge-gnulib (GNULIB_MODULES): Add putenv, unsetenv.
* lib/putenv.c, lib/unsetenv.c, m4/putenv.m4, m4/setenv.m4:
New files, copied automatically from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* src/alloc.c (xputenv): New function.
* src/dbusbind.c (Fdbus_init_bus):
* src/emacs.c (main):
* src/xterm.c (x_term_init):
Use xputenv instead of setenv or putenv, to detect memory exhaustion.
* src/editfns.c (initial_tz): Move static var decl up.
(tzvalbuf_in_environ): New static var.
(init_editfns): Initialize these two static vars.
(Fencode_time): Don't assume arbitrary limit on EMACS_INT width.
Save old TZ value on stack, if it's small.
(Fencode_time, set_time_zone_rule): Don't modify 'environ' directly;
instead, use xputenv+unsetenv to set and restore TZ.
(environbuf): Remove static var. All uses removed.
(Fset_time_zone_rule): Do not save TZ and environ;
no longer needed here.
(set_time_zone_rule_tz1, set_time_zone_rule_tz2) [LOCALTIME_CACHE]:
Move to inside set_time_zone_rule; they don't need file scope any more.
(set_time_zone_rule): Maintain the TZ=value string separately.
(syms_of_editfns): Don't initialize initial_tz;
init_editfns now does it.
* src/emacs.c (dump_tz) [HAVE_TZSET]: Now const.
* src/lisp.h (xputenv): New decl.
Fixes: debbugs:13070
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 3 | ||||
| -rwxr-xr-x | admin/merge-gnulib | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 81d85f8f24c..9c6413aa14f 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,5 +1,8 @@ 2012-12-08 Paul Eggert <eggert@cs.ucla.edu> + Use putenv+unsetenv instead of modifying environ directly (Bug#13070). + * merge-gnulib (GNULIB_MODULES): Add putenv, unsetenv. + Simplify get_lim_data. * CPP-DEFINES (ULIMIT_BREAK_VALUE): Remove. diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 75e7ec6b000..1f60bb2973e 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -31,10 +31,10 @@ GNULIB_MODULES=' dtoastr dtotimespec dup2 environ execinfo faccessat fcntl-h filemode getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat - manywarnings mktime pselect pthread_sigmask readlink + manywarnings mktime pselect pthread_sigmask putenv readlink sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat - sys_time time timer-time timespec-add timespec-sub utimens + sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings ' |