Merge commit 'remotes/fml/master'

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index 15fb7ab038e8f527f0ca1b7b5a9ccfd86aea1a84..68cc5ab55f7c8da0362bb1ae9aa018014a97ede9 100644 (file)
--- a/command.c
+++ b/command.c
@@ -108,7 +108,7 @@ static char *get_status(struct misc_meta_data *nmmd)
        flags = vss_get_status_flags(nmmd->vss_status_flags);
        if (nmmd->size) { /* parent currently has an audio file open */
                localtime_r(&nmmd->mtime, &mtime_tm);
-               strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
+               strftime(mtime, 29, "%b %d %Y", &mtime_tm);
        }
        gettimeofday(&now, NULL);
        ret = make_message(
@@ -696,7 +696,6 @@ int handle_connect(int fd, const char *peername)
        signal(SIGINT, SIG_DFL);
        signal(SIGTERM, SIG_DFL);
        signal(SIGHUP, SIG_DFL);
-       signal(SIGUSR1, SIG_IGN);
 
        /* we need a blocking fd here as recv() might return EAGAIN otherwise. */
        ret = mark_fd_blocking(fd);