Merge branch 't/t0004'

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 1e45eb3616a858091f98f42079d94251963a43ed..0cfac60722d825fddb4714dfba651eb8265e770a 100644 (file)
--- a/server.c
+++ b/server.c
@@ -434,7 +434,7 @@ err:
        exit(EXIT_FAILURE);
 }
 
        exit(EXIT_FAILURE);
 }
 

-static int init_afs(void)
+static int init_afs(int argc, char **argv)

 {
        int ret, afs_server_socket[2];
        pid_t afs_pid;
 {
        int ret, afs_server_socket[2];
        pid_t afs_pid;


@@ -448,6 +448,10 @@ static int init_afs(void)
        if (afs_pid < 0)
                exit(EXIT_FAILURE);
        if (afs_pid == 0) { /* child (afs) */
        if (afs_pid < 0)
                exit(EXIT_FAILURE);
        if (afs_pid == 0) { /* child (afs) */

+               int i;
+               for (i = argc - 1; i >= 0; i--)
+                       memset(argv[i], 0, strlen(argv[i]));
+               sprintf(argv[0], "para_server (afs)");

                close(afs_server_socket[0]);
                afs_init(afs_socket_cookie, afs_server_socket[1]);
        }
                close(afs_server_socket[0]);
                afs_init(afs_socket_cookie, afs_server_socket[1]);
        }


@@ -510,7 +514,7 @@ static void server_init(int argc, char **argv)
         */
        para_block_signal(SIGCHLD);
        PARA_NOTICE_LOG("initializing the audio file selector\n");
         */
        para_block_signal(SIGCHLD);
        PARA_NOTICE_LOG("initializing the audio file selector\n");

-       afs_socket = init_afs();
+       afs_socket = init_afs(argc, argv);

        init_signal_task();
        para_unblock_signal(SIGCHLD);
        PARA_NOTICE_LOG("initializing virtual streaming system\n");
        init_signal_task();
        para_unblock_signal(SIGCHLD);
        PARA_NOTICE_LOG("initializing virtual streaming system\n");