Merge branch 'maint'

[paraslash.git] / command.h

diff --git a/command.h b/command.h
index 851b8f13485a042f8747031ebed1a3bb2e0e3128..d28db0389f01846d4b7bb0c9c37ff156028a2bbf 100644 (file)
--- a/command.h
+++ b/command.h
@@ -11,11 +11,9 @@ struct command_context {
        /** Argument vector. */
        char **argv;
        /** The command being executed. */
-       struct server_command *cmd;
+       const struct server_command *cmd;
        /** File descriptor and crypto keys. */
        struct stream_cipher_context scc;
-       /** Whether to use the sideband API for this command. */
-       bool use_sideband;
 };
 
 /**
@@ -40,6 +38,7 @@ int send_sb(struct stream_cipher_context *scc, void *buf, size_t numbytes,
                int band, bool dont_free);
 __printf_3_4 int send_sb_va(struct stream_cipher_context *scc, int band,
                const char *fmt, ...);
+int send_strerror(struct command_context *cc, int err);
 int recv_sb(struct stream_cipher_context *scc,
                enum sb_designator expected_band,
                size_t max_size, struct iovec *result);