Rename afs.[ch] to afs_common.[ch].

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 35c835ecc143fa6c2d73a1c16687f0ed8a8b8f00..9b79121b3aa16f51662b9e7e2649e097f81b5a26 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -168,14 +168,14 @@ void para_log(int ll, const char* fmt,...)
 
 static char *configfile_exists(void)
 {
-       static char *config_file;
-
-       if (!config_file) {
-               char *home = para_homedir();
-               config_file = make_message("%s/.paraslash/audiod.conf", home);
-               free(home);
-       }
-       return file_exists(config_file)? config_file : NULL;
+       char *home = para_homedir();
+       char *config_file = make_message("%s/.paraslash/audiod.conf",
+               home);
+       free(home);
+       if (file_exists(config_file))
+               return config_file;
+       free(config_file);
+       return NULL;
 }
 
 static void setup_signal_handling(void)
@@ -866,14 +866,14 @@ static int audiod_get_socket(void)
        PARA_NOTICE_LOG("local socket: %s\n", socket_name);
        if (conf.force_given)
                unlink(socket_name);
-       fd = create_pf_socket(socket_name, &unix_addr,
+       fd = create_local_socket(socket_name, &unix_addr,
                        S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
        if (fd < 0) {
-               PARA_EMERG_LOG("%s", "can not connect to socket\n");
+               PARA_EMERG_LOG("can not connect to socket\n");
                exit(EXIT_FAILURE); /* do not unlink socket */
        }
        if (listen(fd , 5) < 0) {
-               PARA_EMERG_LOG("%s", "can not listen on socket\n");
+               PARA_EMERG_LOG("can not listen on socket\n");
                exit(EXIT_FAILURE); /* do not unlink socket */
        }
        mark_fd_nonblock(fd);
@@ -1120,7 +1120,7 @@ static void set_initial_status(void)
  * */
 int main(int argc, char *argv[])
 {
-       char *cf;
+       char *config_file;
        int ret, i;
        struct sched s;
        struct command_task command_task_struct, *cmd_task = &command_task_struct;
@@ -1130,12 +1130,20 @@ int main(int argc, char *argv[])
        audiod_cmdline_parser(argc, argv, &conf);
        HANDLE_VERSION_FLAG("audiod", conf);
        para_drop_privileges(conf.user_arg, conf.group_arg);
-       cf = configfile_exists();
-       if (cf) {
-               if (audiod_cmdline_parser_configfile(cf, &conf, 0, 0, 0)) {
+       config_file = configfile_exists();
+       if (config_file) {
+               struct audiod_cmdline_parser_params params = {
+                       .override = 0,
+                       .initialize = 0,
+                       .check_required = 0,
+                       .check_ambiguity = 0
+
+               };
+               if (audiod_cmdline_parser_config_file(config_file, &conf, &params)) {
                        PARA_EMERG_LOG("%s", "parse error in config file\n");
                        exit(EXIT_FAILURE);
                }
+               free(config_file);
        }
        if (conf.logfile_given)
                logfile = open_log(conf.logfile_arg);