pgpool2.git / summary / log / commit / refs

commit    72e77f9b7d5ee9a006ba7f8805a3365e84afb7bb
Author:   Tatsuo Ishii <ishii at sraoss.co.jp>
Date:     Fri Oct 22 23:53:20 2010 +0000

    Fix in-portability of the way to use dirname(3) in locating
    pool_passwd. Bug report from a FreeBSD user.


 main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index 34b0a0f7e..72945a144 100644
--- a/main.c
+++ b/main.c
@@ -320,11 +320,12 @@ int main(int argc, char **argv)
 	{
 		char pool_passwd[POOLMAXPATHLEN+1];
 		char dirnamebuf[POOLMAXPATHLEN+1];
+		char *dirp;
 
 		strncpy(dirnamebuf, conf_file, sizeof(dirnamebuf));
-		dirname(dirnamebuf);
+		dirp = dirname(dirnamebuf);
 		snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s",
-				 dirnamebuf, pool_config->pool_passwd);
+				 dirp, pool_config->pool_passwd);
 		pool_init_pool_passwd(pool_passwd);
 	}
 


[parent: 5ae03c3e1e1c]