Merge commit 'remotes/fml/master'

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index febfe2ad02ca2828c1dffe65d2243ed8b661e605..bb80738634d9fb68027e344521b2c806876a9f75 100644 (file)
--- a/server.c
+++ b/server.c
@@ -199,7 +199,6 @@ static void shm_init(void)
        mmd->events = 0;
        mmd->num_connects = 0;
        mmd->active_connections = 0;
-       strcpy(mmd->afd.path, "(none)");
        mmd->vss_status_flags = VSS_NEXT;
        mmd->new_vss_status_flags = VSS_NEXT;
        mmd->sender_cmd_data.cmd_num = -1;
@@ -309,7 +308,7 @@ static unsigned init_network(void)
        if (ret < 0)
                goto err;
        fd = ret;
-       ret = mark_fd_nonblock(fd);
+       ret = mark_fd_nonblocking(fd);
        if (ret < 0)
                goto err;
        add_close_on_fork_list(fd); /* child doesn't need the listener */
@@ -364,7 +363,7 @@ static void init_afs(void)
        }
        close(afs_server_socket[1]);
        afs_socket = afs_server_socket[0];
-       ret = mark_fd_nonblock(afs_socket);
+       ret = mark_fd_nonblocking(afs_socket);
        if (ret < 0)
                exit(EXIT_FAILURE);
        add_close_on_fork_list(afs_socket);