Hacked nbd-client.c to include a flag -nofork, that allows the nbd-client process...

Signed-off-by: Wouter Verhelst <w@uter.be>

diff --git a/nbd-client.c b/nbd-client.c
index eba063f..73ce456 100644 (file)
--- a/nbd-client.c
+++ b/nbd-client.c
@@ -209,6 +209,7 @@ int main(int argc, char *argv[]) {
        int cont=0;
        int timeout=0;
        int sdp=0;
+       int nofork=0;
        u64 size64;
        u32 flags;
 
@@ -298,6 +299,12 @@ int main(int argc, char *argv[]) {
                        ++argv;--argc;
                }
        }
+       if (argc) {
+               if(strncmp(argv[0], "-nofork", 7)==0) {
+                       nofork=1;
+                       ++argv;--argc;
+               }
+       }
        if(argc) goto errmsg;
        sock = opennet(hostname, port, sdp);
        argv=NULL; argc=0; /* don't use it later suddenly */
@@ -312,12 +319,14 @@ int main(int argc, char *argv[]) {
        chdir("/");
        do {
 #ifndef NOFORK
-               if (fork()) {
-                       while(check_conn(nbddev, 0)) {
-                               sleep(1);
+               if (!nofork) {
+                       if (fork()) {
+                               while(check_conn(nbddev, 0)) {
+                                       sleep(1);
+                               }
+                               open(nbddev, O_RDONLY);
+                               exit(0);
                        }
-                       open(nbddev, O_RDONLY);
-                       exit(0);
                }
 #endif