diff options
| author | Daniel Beulshausen <dbeu@php.net> | 2000-11-27 18:21:48 +0000 |
|---|---|---|
| committer | Daniel Beulshausen <dbeu@php.net> | 2000-11-27 18:21:48 +0000 |
| commit | aa1114464964c9a1c872f2b91125c5fb1cfa9691 (patch) | |
| tree | 4f4d448e767a648c5263f708462b26a1b7643666 /ext/gettext/gettext.c | |
| parent | 81814c8ddc683de6e00627bebfa0c457e5530e8f (diff) | |
| download | php-git-aa1114464964c9a1c872f2b91125c5fb1cfa9691.tar.gz | |
fix path operations, under win32
Diffstat (limited to 'ext/gettext/gettext.c')
| -rw-r--r-- | ext/gettext/gettext.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index 71dfc63fe0..5bfb53b12b 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -146,8 +146,7 @@ PHP_FUNCTION(dcgettext) PHP_FUNCTION(bindtextdomain) { pval **domain_name, **dir; - char *retval, *dir_name; - char *val; + char *retval, dir_name[MAXPATHLEN]; if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &domain_name, &dir) == FAILURE) @@ -157,11 +156,10 @@ PHP_FUNCTION(bindtextdomain) convert_to_string_ex(domain_name); convert_to_string_ex(dir); - val = (*dir)->value.str.val; - if (strcmp(val, "") && strcmp(val, "0")) { - dir_name = val; + if (strcmp((*dir)->value.str.val, "") && strcmp((*dir)->value.str.val, "0")) { + V_REALPATH((*dir)->value.str.val, dir_name); } else { - dir_name = NULL; + V_GETCWD(dir_name, MAXPATHLEN); } retval = bindtextdomain((*domain_name)->value.str.val, dir_name); |