client: Remove sb-compatibility code.

[paraslash.git] / blob.c

diff --git a/blob.c b/blob.c
index 50921bd4da5796d2acfa34c00a8d724c576bb67a..a6ae1acf61237aaa31b18035739acefd80c52fc1 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -437,10 +437,7 @@ static int stdin_command(struct command_context *cc, struct osl_object *arg_obj,
        struct osl_object query, stdin_obj;
        int ret;
 
-       if (cc->use_sideband)
-               ret = send_sb(&cc->scc, NULL, 0, SBD_AWAITING_DATA, false);
-       else
-               ret = sc_send_buffer(&cc->scc, AWAITING_DATA_MSG);
+       ret = send_sb(&cc->scc, NULL, 0, SBD_AWAITING_DATA, false);
        if (ret < 0)
                return ret;
        ret = fd2buf(&cc->scc, &stdin_obj);
@@ -449,7 +446,9 @@ static int stdin_command(struct command_context *cc, struct osl_object *arg_obj,
        query.size = arg_obj->size + stdin_obj.size;
        query.data = para_malloc(query.size);
        memcpy(query.data, arg_obj->data, arg_obj->size);
-       memcpy((char *)query.data + arg_obj->size, stdin_obj.data, stdin_obj.size);
+       if (stdin_obj.size > 0)
+               memcpy((char *)query.data + arg_obj->size, stdin_obj.data,
+                       stdin_obj.size);
        free(stdin_obj.data);
        ret = send_callback_request(f, &query, result_handler, private_result_data);
        free(query.data);