Fix in-portability of the way to use dirname(3) in locating
authorTatsuo Ishii <ishii at sraoss.co.jp>
Fri, 22 Oct 2010 23:53:20 +0000 (23:53 +0000)
committerTatsuo Ishii <ishii at sraoss.co.jp>
Fri, 22 Oct 2010 23:53:20 +0000 (23:53 +0000)
pool_passwd. Bug report from a FreeBSD user.

main.c

diff --git a/main.c b/main.c
index 34b0a0f7e11761bb579224ab2877616188040549..72945a14438e9149ab7b130fee6d4f2ee92dda9f 100644 (file)
--- 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);
        }