Merge branch 'master' into names

diff --git a/nbd-client.8.sgml b/nbd-client.8.sgml
index 65f0e21..fa30f70 100644 (file)
--- a/nbd-client.8.sgml
+++ b/nbd-client.8.sgml
@@ -87,7 +87,9 @@ manpage.1: manpage.sgml
     either in the kernel, or as a module, you can connect to an NBD
     server and use its exported file through a block special file with
     major mode 43.</para>
-    
+
+    <para>Optionally, long options can also be specified with two
+      leading dashes.</para>
   </refsect1>
   <refsect1>
     <title>OPTIONS</title>

diff --git a/nbd-client.c b/nbd-client.c
index aeaa231..f7b8e2d 100644 (file)
--- a/nbd-client.c
+++ b/nbd-client.c
@@ -384,8 +384,7 @@ int main(int argc, char *argv[]) {
                        blocksize=(int)strtol(optarg, NULL, 0);
                        break;
                case 'c':
-                       check_conn(optarg, 1);
-                       exit(EXIT_SUCCESS);
+                       return check_conn(optarg, 1);
                case 'd':
                        disconnect(optarg);
                        exit(EXIT_SUCCESS);