using more portable dirname() function

* removing include of <string.h> (which include GNU dirname, which
doesn't follow posix spec, and force using libgen.h
* removing #ifdef for FreeBSD handling of dirname as it's not necessary
anymore.
This commit is contained in:
kakwa 2017-01-28 03:21:11 +01:00
parent 05051d783d
commit 3542a13ab1
1 changed files with 4 additions and 7 deletions

View File

@ -11,7 +11,6 @@
#endif /* BSD */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/syslog.h>
#include <unistd.h>
@ -97,12 +96,9 @@ int main(int argc, char **argv) {
// get the directory containing the configuration file
// other uts-server files (ca, certs, etc) can be declared relatively to the
// configuration file
char *conf_wd = strdup(conf_fp);
#ifdef BSD
conf_wd = dirname(conf_wd);
#else
dirname(conf_wd);
#endif /* BSD */
char *tmp_wd = strdup(conf_fp);
char *conf_wd = dirname(tmp_wd);
if (args.daemonize)
skeleton_daemon();
@ -124,6 +120,7 @@ int main(int argc, char **argv) {
syslog(LOG_NOTICE, "uts-server daemon terminated.");
free(conf_wd);
free(tmp_wd);
closelog();
return ret;