fd: Improve error handling of write_nonblock().

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index aa827f2b1cdc9ffd9984379b55c02223addcca1b..4aa262ce36f2f07c026e8453bfc2364f4684884f 100644 (file)
--- a/command.c
+++ b/command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -126,7 +126,7 @@ static char *get_status(struct misc_meta_data *nmmd, int parser_friendly)
         * The calls to WRITE_STATUS_ITEM() below never fail because
         * b->max_size is zero (unlimited), see para_printf(). However, clang
         * is not smart enough to prove this and complains nevertheless.
-        * Casting the return value to void silences solves this.
+        * Casting the return value to void silences clang.
         */
        (void)WRITE_STATUS_ITEM(&b, SI_FILE_SIZE, "%zu\n", nmmd->size / 1024);
        (void)WRITE_STATUS_ITEM(&b, SI_MTIME, "%s\n", mtime);
@@ -750,7 +750,7 @@ __noreturn void handle_connect(int fd, const char *peername)
        if (ret < 0)
                goto net_err;
        /* send Welcome message */
-       ret = send_va_buffer(fd, "This is para_server, version "
+       ret = write_va_buffer(fd, "This is para_server, version "
                PACKAGE_VERSION  ".\n" );
        if (ret < 0)
                goto net_err;
@@ -786,7 +786,7 @@ __noreturn void handle_connect(int fd, const char *peername)
        }
        PARA_DEBUG_LOG("sending %u byte challenge + rc4 keys (%zu bytes)\n",
                CHALLENGE_SIZE, numbytes);
-       ret = send_bin_buffer(fd, buf, numbytes);
+       ret = write_all(fd, buf, numbytes);
        if (ret < 0)
                goto net_err;
        /* recv challenge response */