aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-12-08 20:27:37 +0200
committerEli Zaretskii2012-12-08 20:27:37 +0200
commita16e75cd3cb27ea5647774bc71625899f35b2fa6 (patch)
tree65306facbe512d0ebe30939c82e774db11bd0cb0 /src
parent5745a7df2b4abe06d032820f6ec7ddbac9ad5028 (diff)
downloademacs-a16e75cd3cb27ea5647774bc71625899f35b2fa6.tar.gz
emacs-a16e75cd3cb27ea5647774bc71625899f35b2fa6.zip
Fix putenv and unsetenv on MS-Windows.
src/w32.c (unsetenv): Return 0 if the input string is too long. nt/inc/ms-w32.h (sys_putenv): Add prototype. Fixes: debbugs:13070
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0be3eee6726..222be9575b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-12-08 Eli Zaretskii <eliz@gnu.org>
2
3 * w32.c (unsetenv): Return 0 if the input string is too long.
4
12012-12-08 Paul Eggert <eggert@cs.ucla.edu> 52012-12-08 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Use putenv+unsetenv instead of modifying environ directly (Bug#13070). 7 Use putenv+unsetenv instead of modifying environ directly (Bug#13070).
diff --git a/src/w32.c b/src/w32.c
index 203c5cd40ff..b6bb653369d 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1562,7 +1562,7 @@ unsetenv (const char *name)
1562 if (name_len > 32767) 1562 if (name_len > 32767)
1563 { 1563 {
1564 errno = ENOMEM; 1564 errno = ENOMEM;
1565 return -1; 1565 return 0;
1566 } 1566 }
1567 /* It is safe to use 'alloca' with 32K size, since the stack is at 1567 /* It is safe to use 'alloca' with 32K size, since the stack is at
1568 least 2MB, and we set it to 8MB in the link command line. */ 1568 least 2MB, and we set it to 8MB in the link command line. */