client.c: supervisor task should use post_select instead of pre_select.

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index d35113a500f0a2b78ce853996db9413bafd0be4f..4eab9f65348990e5f4f95568623f032376a43b4e 100644 (file)
--- a/command.c
+++ b/command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -20,12 +20,12 @@
 #include "afs.h"
 #include "server.h"
 #include "vss.h"
+#include "list.h"
 #include "send.h"
 #include "rc4.h"
 #include "net.h"
 #include "daemon.h"
 #include "fd.h"
-#include "list.h"
 #include "user_list.h"
 #include "server_command_list.h"
 #include "afs_command_list.h"
@@ -242,9 +242,9 @@ int com_sender(int fd, int argc, char * const * argv)
                if (scd.sender_num < 0)
                        return ret;
                msg = senders[scd.sender_num].help();
-               send_buffer(fd, msg);
+               ret = send_buffer(fd, msg);
                free(msg);
-               return 1;
+               return ret;
        }
        for (i = 0; i < 10; i++) {
                mmd_lock();
@@ -309,7 +309,7 @@ int com_version(int fd, int argc, __a_unused char * const * argv)
                return -E_COMMAND_SYNTAX;
        return send_buffer(fd, VERSION_TEXT("server")
                "built: " BUILD_DATE "\n"
-               SYSTEM ", " CC_VERSION "\n"
+               UNAME_RS ", " CC_VERSION "\n"
        );
 }
 
@@ -335,7 +335,7 @@ int com_stat(int fd, int argc, char * const * argv)
                if (ret < 0)
                        goto out;
                ret = 1;
-               if (num == 1)
+               if (num > 0 && !--num)
                        goto out;
                sleep(50);
                if (getppid() == 1)
@@ -578,7 +578,7 @@ out:
  */
 static int check_perms(unsigned int perms, struct server_command *cmd_ptr)
 {
-       PARA_DEBUG_LOG("%s", "checking permissions\n");
+       PARA_DEBUG_LOG("checking permissions\n");
        return (cmd_ptr->perms & perms) < cmd_ptr->perms ? -E_PERM : 0;
 }
 
@@ -804,9 +804,9 @@ int handle_connect(int fd, const char *peername)
                goto out;
        }
 err_out:
-       send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+       send_va_buffer(fd, "%s\n", para_strerror(-ret));
 net_err:
-       PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret));
+       PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
        ret = EXIT_FAILURE;
 out:
        free(command);