Fix a bug in the mood line parser.

[paraslash.git] / afs.c

diff --git a/afs.c b/afs.c
index 901ae00deca346e78a76be2841acccb2feacd4c4..c2ac0e4110e15ceac8f677947894e2a1afd057b4 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -75,11 +75,15 @@ struct command_task {
        struct task task;
 };
 
+extern struct misc_meta_data *mmd;
+
 static int server_socket;
 static struct command_task command_task_struct;
 static struct signal_task signal_task_struct;
 
 static enum play_mode current_play_mode;
+static char *current_mop; /* mode or playlist specifier. NULL means dummy mooe */
+
 
 /**
  * A random number used to "authenticate" the connection.
@@ -431,7 +435,7 @@ int stdin_command(int fd, struct osl_object *arg_obj, callback_function *f,
        return ret;
 }
 
-int pass_afd(int fd, char *buf, size_t size)
+static int pass_afd(int fd, char *buf, size_t size)
 {
        struct msghdr msg = {.msg_iov = NULL};
        struct cmsghdr *cmsg;
@@ -456,7 +460,7 @@ int pass_afd(int fd, char *buf, size_t size)
 
        /* Sum of the length of all control messages in the buffer */
        msg.msg_controllen = cmsg->cmsg_len;
-       PARA_NOTICE_LOG("passing %zu bytes and fd %d\n", size, fd);
+       PARA_DEBUG_LOG("passing %zu bytes and fd %d\n", size, fd);
        ret = sendmsg(server_socket, &msg, 0);
        if (ret < 0) {
                ret = -ERRNO_TO_PARA_ERROR(errno);
@@ -483,7 +487,7 @@ int open_next_audio_file(void)
        int ret, shmid;
        char buf[8];
 
-       PARA_NOTICE_LOG("getting next af\n");
+       PARA_NOTICE_LOG("getting next audio file\n");
        ret = score_get_best(&aft_row, &afd.score);
        if (ret < 0)
                return ret;
@@ -491,7 +495,6 @@ int open_next_audio_file(void)
        if (ret < 0)
                return ret;
        shmid = ret;
-       PARA_NOTICE_LOG("shmid: %u\n", shmid);
        if (!write_ok(server_socket)) {
                PARA_EMERG_LOG("afs_socket not writable\n");
                goto destroy;
@@ -508,8 +511,6 @@ destroy:
        return ret;
 }
 
-static char *current_mop; /* mode or playlist specifier. NULL means dummy mooe */
-
 /* Never fails if arg == NULL */
 static int activate_mood_or_playlist(char *arg, int *num_admissible)
 {
@@ -536,10 +537,17 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
        current_play_mode = mode;
        if (arg != current_mop) {
                free(current_mop);
-               if (arg)
+               if (arg) {
                        current_mop = para_strdup(arg);
-               else
+                       mmd_lock();
+                       strcpy(mmd->afs_mode_string, arg); /* FIXME: check length */
+                       mmd_unlock();
+               } else {
+                       mmd_lock();
+                       strcpy(mmd->afs_mode_string, "dummy");
+                       mmd_unlock();
                        current_mop = NULL;
+               }
        }
        return 1;
 }
@@ -566,7 +574,7 @@ static int com_select_callback(const struct osl_object *query,
                ret = activate_mood_or_playlist(current_mop, &num_admissible);
                if (ret < 0) {
                        para_printf(&pb, "failed, switching to dummy\n");
-                       change_current_mood(NULL); /* always successful */
+                       activate_mood_or_playlist(NULL, &num_admissible);
                }
        }
        para_printf(&pb, "activated %s (%d admissible files)\n", current_mop?
@@ -594,16 +602,10 @@ int com_select(int fd, int argc, char * const * const argv)
        return ret;
 }
 
-static void init_admissible_files(void)
+static void init_admissible_files(char *arg)
 {
-       int ret = 0;
-       char *arg = conf.afs_initial_mode_arg;
-       ret = activate_mood_or_playlist(arg, NULL);
-       if (ret >= 0)
-               return;
-       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-       PARA_NOTICE_LOG("defaulting to dummy mood\n");
-       activate_mood_or_playlist(NULL, NULL); /* always successful */
+       if (activate_mood_or_playlist(arg, NULL) < 0)
+               activate_mood_or_playlist(NULL, NULL); /* always successful */
 }
 
 static int setup_command_socket_or_die(void)
@@ -669,18 +671,20 @@ static int open_afs_tables(void)
        int i, ret;
 
        get_database_dir();
+       PARA_NOTICE_LOG("opening %u osl tables in %s\n", NUM_AFS_TABLES,
+               database_dir);
        for (i = 0; i < NUM_AFS_TABLES; i++) {
                ret = afs_tables[i].open(database_dir);
                if (ret >= 0)
                        continue;
                PARA_ERROR_LOG("%s init: %s\n", afs_tables[i].name,
                        PARA_STRERROR(-ret));
+               break;
        }
        if (ret >= 0)
                return ret;
-       do
-               afs_tables[i].close();
-       while (i--);
+       while (i)
+               afs_tables[--i].close();
        return ret;
 }
 
@@ -700,6 +704,9 @@ static void signal_pre_select(struct sched *s, struct task *t)
 static void signal_post_select(struct sched *s, struct task *t)
 {
        struct signal_task *st = t->private_data;
+       t->ret = -E_AFS_PARENT_DIED;
+       if (getppid() == 1)
+               goto err;
        t->ret = 1;
        if (!FD_ISSET(st->fd, &s->rfds))
                return;
@@ -710,10 +717,14 @@ static void signal_post_select(struct sched *s, struct task *t)
        if (st->signum == SIGHUP) {
                close_afs_tables();
                t->ret = open_afs_tables();
+               if (t->ret < 0)
+                       goto err;
+               init_admissible_files(current_mop);
                return;
        }
-       PARA_NOTICE_LOG("caught signal %d\n", st->signum);
        t->ret = -E_AFS_SIGNAL;
+err:
+       PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
        unregister_tasks();
 }
 
@@ -820,10 +831,11 @@ static void execute_server_command(void)
                return;
        }
        buf[ret] = '\0';
-       PARA_NOTICE_LOG("received: %s\n", buf);
+       PARA_DEBUG_LOG("received: %s\n", buf);
        if (!strcmp(buf, "new")) {
                ret = open_next_audio_file();
-               PARA_NOTICE_LOG("ret: %d\n", ret);
+               if (ret < 0)
+                       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
                return;
        }
        PARA_ERROR_LOG("unknown command\n");
@@ -950,10 +962,10 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd)
                exit(EXIT_FAILURE);
        PARA_INFO_LOG("server_socket: %d, afs_socket_cookie: %u\n",
                server_socket, (unsigned) cookie);
-       init_admissible_files();
+       init_admissible_files(conf.afs_initial_mode_arg);
        register_tasks(cookie);
        s.default_timeout.tv_sec = 0;
-       s.default_timeout.tv_usec = 99 * 1000;
+       s.default_timeout.tv_usec = 999 * 1000;
        ret = sched(&s);
        if (ret < 0)
                PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));