You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/07/20 21:13:44 UTC
cvs commit: httpd-2.0/support htpasswd.c
wrowe 01/07/20 12:13:44
Modified: support htpasswd.c
Log:
A pool is a REQUIRED ARGUMENT, never optional (NULL).
This is why Mladen observed that htpasswd was still broken.
Revision Changes Path
1.37 +3 -3 httpd-2.0/support/htpasswd.c
Index: htpasswd.c
===================================================================
RCS file: /home/cvs/httpd-2.0/support/htpasswd.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- htpasswd.c 2001/02/25 15:27:07 1.36
+++ htpasswd.c 2001/07/20 19:13:44 1.37
@@ -350,12 +350,12 @@
/*
* Return true if the named file exists, regardless of permissions.
*/
-static int exists(char *fname)
+static int exists(char *fname, apr_pool_t *pool)
{
apr_finfo_t sbuf;
apr_status_t check;
- check = apr_stat(&sbuf, fname, APR_FINFO_NORM, NULL);
+ check = apr_stat(&sbuf, fname, APR_FINFO_NORM, pool);
return (check ? 0 : 1);
}
@@ -532,7 +532,7 @@
* Verify that the file exists if -c was omitted. We give a special
* message if it doesn't.
*/
- if ((! newfile) && (! exists(pwfilename))) {
+ if ((! newfile) && (! exists(pwfilename, pool))) {
fprintf(stderr,
"%s: cannot modify file %s; use '-c' to create it\n",
argv[0], pwfilename);