From 53b949926f1bf0c6070650aae5f474e8df5378df Mon Sep 17 00:00:00 2001 From: Thomas Richter Date: Thu, 4 Jun 2020 09:00:35 +0200 Subject: [PATCH] vmcp: Change sequence of failed exit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When vmcp fails to execute a CP command with both error conditions - response buffer is too small - CP command failed then the vmcp program exits with 'response buffer too small' indication. However, an exit code indicating 'CP command failed' would be more important in this case. So change the vmcp exit code and return 'CP command failed' for above error scenario. Signed-off-by: Thomas Richter Signed-off-by: Jan Höppner --- vmcp/vmcp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vmcp/vmcp.c b/vmcp/vmcp.c index e1a65cb0..10b2361e 100644 --- a/vmcp/vmcp.c +++ b/vmcp/vmcp.c @@ -235,15 +235,15 @@ int main(int argc, char **argv) write_buffer(STDOUT_FILENO, cp.response, MIN(cp.response_size, cp.buffer_size)); free(cp.response); - if (ret == VMCP_ERR_TOOSMALL) { - fprintf(stderr, "Error: output (%d bytes) was truncated, try " - "--buffer to increase size\n", cp.response_size); - return VMCP_BUF; - } if (cp.cprc > 0) { fprintf(stderr, "Error: non-zero CP response for command '%s': " "#%d\n", command, cp.cprc); return VMCP_CP; } + if (ret == VMCP_ERR_TOOSMALL) { + fprintf(stderr, "Error: output (%d bytes) was truncated, try " + "--buffer to increase size\n", cp.response_size); + return VMCP_BUF; + } return EXIT_SUCCESS; }