X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=afs.c;h=865effde671a4848298ab09d502898c6225a937c;hb=420a1f30cc06482f36371d096635846f8800e198;hp=78e42eaec54b9a1cbb87a3c349a0fa12ae98601f;hpb=53acbbcaef77a64a38c916261defcb33abc7d780;p=paraslash.git diff --git a/afs.c b/afs.c index 78e42eae..865effde 100644 --- a/afs.c +++ b/afs.c @@ -448,7 +448,7 @@ static int activate_mood_or_playlist(const char *arg, struct para_buffer *pb) mode = PLAY_MODE_MOOD; } else { ret = -ERRNO_TO_PARA_ERROR(EINVAL); - msg = make_message("%s: parse error", arg); + msg = make_message("%s: parse error\n", arg); } if (pb) para_printf(pb, "%s", msg); @@ -580,17 +580,6 @@ static void get_database_dir(void) PARA_INFO_LOG("afs_database dir %s\n", database_dir); } -static int make_database_dir(void) -{ - int ret; - - get_database_dir(); - ret = para_mkdir(database_dir, 0777); - if (ret >= 0 || ret == -ERRNO_TO_PARA_ERROR(EEXIST)) - return 1; - return ret; -} - static int open_afs_tables(void) { int i, ret; @@ -963,6 +952,7 @@ __noreturn void afs_init(int socket_fd) ret = schedule(&s); sched_shutdown(&s); mood_unload(); + playlist_unload(); out_close: close_afs_tables(); out: @@ -1061,7 +1051,8 @@ static int com_init(struct command_context *cc, struct lls_parse_result *lpr) .size = sizeof(table_mask)}; unsigned num_inputs = lls_num_inputs(lpr); - ret = make_database_dir(); + get_database_dir(); + ret = para_mkdir(database_dir); if (ret < 0) return ret; if (num_inputs > 0) {