search for: have_exit_with_par

With these patches, a majority of tests pass. The notable things which are still broken: - Because FreeBSD links /home -> /usr/home, $(pwd) gives a different result from realpath(2). Therefore some tests which implicitly rely on (eg) a plugin which calls nbdkit_realpath internally and then checking that path against $(pwd) fail. - Shebangs (#!) don't seem to work the same way

...ct new_handshake_finish handshake_finish; + struct nbd_new_option option; + struct nbd_new_handshake_finish handshake_finish; uint16_t eflags; - struct request request; - struct simple_reply reply; + struct nbd_request request; + struct nbd_simple_reply reply; char data[512]; #ifndef HAVE_EXIT_WITH_PARENT @@ -175,7 +175,7 @@ main (int argc, char *argv[]) exit (EXIT_FAILURE); } if (memcmp (handshake.nbdmagic, "NBDMAGIC", 8) != 0 || - be64toh (handshake.version) != NEW_VERSION) { + be64toh (handshake.version) != NBD_NEW_VERSION) { fprintf (stderr, "%s: unexp...

.../* Add flag to the linked list. */ flag->next = debug_flags; @@ -242,13 +243,13 @@ main (int argc, char *argv[]) exit (EXIT_SUCCESS); case DUMP_PLUGIN_OPTION: - dump_plugin = 1; + dump_plugin = true; break; case EXIT_WITH_PARENT_OPTION: #ifdef HAVE_EXIT_WITH_PARENT - exit_with_parent = 1; - foreground = 1; + exit_with_parent = true; + foreground = true; break; #else fprintf (stderr, @@ -300,7 +301,7 @@ main (int argc, char *argv[]) exit (EXIT_FAILURE); } run = optarg; - foreground = 1; + f...

...15d2..6149c02 100644 --- a/tests/test-layers.c +++ b/tests/test-layers.c @@ -92,7 +92,7 @@ main (int argc, char *argv[]) struct new_handshake_finish handshake_finish; uint16_t eflags; struct request request; - struct reply reply; + struct simple_reply reply; char data[512]; #ifndef HAVE_EXIT_WITH_PARENT -- 2.20.1

We should have only one NBD protocol file. Let's make nbdkit's version the canonical one, and use it in libnbd. Rich.