summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2000-12-16 20:52:43 +0000
committerAndi Gutmans <andi@php.net>2000-12-16 20:52:43 +0000
commit86a1cace276f827bd8261e624c4839b58ffc5f15 (patch)
tree60527ca4b4148f6aa014a444aed491c53a4742ac /ext
parent93a93c242973f8152b24a2b2beab236220404bfa (diff)
downloadphp-git-86a1cace276f827bd8261e624c4839b58ffc5f15.tar.gz
- Make all places use MAXPATHLEN in the same way. It includes the
terminating NULL.
Diffstat (limited to 'ext')
-rw-r--r--ext/dba/dba.c10
-rw-r--r--ext/standard/dir.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index c432b70018..053861aadc 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -211,11 +211,21 @@ static PHP_MSHUTDOWN_FUNCTION(dba)
static PHP_MINFO_FUNCTION(dba)
{
dba_handler *hptr;
+<<<<<<< dba.c
+ static char handlers[80];
+=======
smart_str handlers = {0};
+>>>>>>> 1.28
+
+ handlers[0] = '\0';
for(hptr = handler; hptr->name; hptr++) {
+<<<<<<< dba.c
+ strlcat(handlers, hptr->name, sizeof(handlers));
+=======
smart_str_appends(&handlers, hptr->name);
smart_str_appendc(&handlers, ' ');
+>>>>>>> 1.28
}
php_info_print_table_start();
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 131540816a..97f2ac89c6 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -259,7 +259,7 @@ PHP_FUNCTION(getcwd)
}
#if HAVE_GETCWD
- ret = V_GETCWD(path,MAXPATHLEN-1);
+ ret = V_GETCWD(path, MAXPATHLEN);
#elif HAVE_GETWD
ret = V_GETWD(path);
/*