cvs: php4 /ext/gettext gettext.c
| From: | Daniel Beulshausen | Date: | Mon, 27 Nov 2000 18:21:48 +0000 |
| Subject: | cvs: php4 /ext/gettext gettext.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2805@lists.php.net to get a copy of this message | ||
dbeu Mon Nov 27 10:21:48 2000 EDT
Modified files:
/php4/ext/gettext gettext.c
Log:
fix path operations, under win32
Index: php4/ext/gettext/gettext.c
diff -u php4/ext/gettext/gettext.c:1.20 php4/ext/gettext/gettext.c:1.21
--- php4/ext/gettext/gettext.c:1.20 Tue Aug 8 13:28:19 2000
+++ php4/ext/gettext/gettext.c Mon Nov 27 10:21:48 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gettext.c,v 1.20 2000/08/08 20:28:19 eschmid Exp $ */
+/* $Id: gettext.c,v 1.21 2000/11/27 18:21:48 dbeu Exp $ */
#include <stdio.h>
#include "php.h"
@@ -146,8 +146,7 @@
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 @@
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);