cvs: php4 /ext/dba dba_dbm.c
| From: | Andi Gutmans | Date: | Sat, 16 Dec 2000 20:56:44 +0000 |
| Subject: | cvs: php4 /ext/dba dba_dbm.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3189@lists.php.net to get a copy of this message | ||
andi Sat Dec 16 12:56:44 2000 EDT
Modified files:
/php4/ext/dba dba_dbm.c
Log:
- In PHP we're supposed to only use MAXPATHLEN (defined in php.h)
Index: php4/ext/dba/dba_dbm.c
diff -u php4/ext/dba/dba_dbm.c:1.5 php4/ext/dba/dba_dbm.c:1.6
--- php4/ext/dba/dba_dbm.c:1.5 Mon Jul 10 03:09:14 2000
+++ php4/ext/dba/dba_dbm.c Sat Dec 16 12:56:44 2000
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba_dbm.c,v 1.5 2000/07/10 10:09:14 sas Exp $ */
+/* $Id: dba_dbm.c,v 1.6 2000/12/16 20:56:44 andi Exp $ */
#include "php.h"
@@ -44,13 +44,9 @@
#define DBM_DATA dba_dbm_data *dba = info->dbf
#define DBM_GKEY datum gkey; gkey.dptr = (char *) key; gkey.dsize = keylen
-#ifndef PATH_MAX
-#define PATH_MAX 255
-#endif
-
#define TRUNC_IT(extension, mode) \
- snprintf(buf, PATH_MAX, "%s" extension, info->path); \
- buf[PATH_MAX] = '\0'; \
+ snprintf(buf, MAXPATHLEN, "%s" extension, info->path); \
+ buf[MAXPATHLEN-1] = '\0'; \
if((fd = V_OPEN((buf, O_CREAT | mode | O_WRONLY, filemode))) == -1) \
return FAILURE; \
close(fd);
@@ -71,7 +67,7 @@
}
if(info->mode == DBA_TRUNC) {
- char buf[PATH_MAX + 1];
+ char buf[MAXPATHLEN];
/* dbm/ndbm original */
TRUNC_IT(".pag", O_TRUNC);
@@ -79,7 +75,7 @@
}
if(info->mode == DBA_CREAT) {
- char buf[PATH_MAX + 1];
+ char buf[MAXPATHLEN];
TRUNC_IT(".pag", 0);
TRUNC_IT(".dir", 0);