summaryrefslogtreecommitdiff
path: root/extra/config
diff options
context:
space:
mode:
authorAustin Foxley <austinf@cetoncorp.com>2010-04-02 09:17:30 -0700
committerAustin Foxley <austinf@cetoncorp.com>2010-04-02 09:17:30 -0700
commitaae3eb9256affb18cff589b52ee26e0a4e557bbd (patch)
tree003711a54e7dfbde0b50979e2942fd3e0d3451c8 /extra/config
parentef18cfe8ebab25f5ef92e81956f50e2dc57df602 (diff)
parent2864786ad884369ab5397be864e9f43d32bc2726 (diff)
Merge commit 'origin/master' into nptl
Conflicts: Makefile.in extra/Configs/Config.in libc/sysdeps/linux/common/bits/kernel-features.h libc/sysdeps/linux/common/poll.c libc/sysdeps/linux/common/sysdep.h libc/sysdeps/linux/sh/sysdep.h Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'extra/config')
-rw-r--r--extra/config/confdata.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/extra/config/confdata.c b/extra/config/confdata.c
index 281dd0024..2b848d5d0 100644
--- a/extra/config/confdata.c
+++ b/extra/config/confdata.c
@@ -402,6 +402,8 @@ int conf_write(const char *name)
char *env;
dirname[0] = 0;
+ if (name == NULL)
+ name = conf_get_configname();
if (name && name[0]) {
struct stat st;
char *slash;