r50: Whoops. This actually had to be committed to the virthost branch,

[nbd.git] / nbd-client.c

diff --git a/nbd-client.c b/nbd-client.c
index 38f8b4e..379a3bd 100644 (file)
--- a/nbd-client.c
+++ b/nbd-client.c
@@ -8,6 +8,9 @@
  * Version 1.1 - added bs (blocksize) option (Alexey Guzeev, aga@permonline.ru)
  * Version 1.2 - I added new option '-d' to send the disconnect request
  * Version 2.0 - Version synchronised with server
+ * Version 2.1 - Check for disconnection before INIT_PASSWD is received
+ *     to make errormsg a bit more helpful in case the server can't
+ *     open the exported file.
  */
 
 #include <asm/page.h>
@@ -69,6 +72,7 @@ int main(int argc, char *argv[])
 
        if (argc < 3) {
        errmsg:
+               fprintf(stderr, "nbd-client version %s\n", PACKAGE_VERSION);
                fprintf(stderr, "Usage: nbd-client [bs=blocksize] host port nbd_device [-swap]\n");
                fprintf(stderr, "Or   : nbd-client -d nbd_device\n");
                fprintf(stderr, "Default value for blocksize is 1024 (recommended for ethernet)\n");
@@ -129,6 +133,8 @@ int main(int argc, char *argv[])
        printf("Negotiation: ");
        if (read(sock, buf, 8) < 0)
                err("Failed/1: %m");
+       if (strlen(buf)==0)
+               err("Server closed connection");
        if (strcmp(buf, INIT_PASSWD))
                err("INIT_PASSWD bad");
        printf(".");