r337: Check multi-file export in 'make check', too; and tell automake that we have...

[nbd.git] / nbd-server.c

diff --git a/nbd-server.c b/nbd-server.c
index 8f44c24..a683f8c 100644 (file)
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -170,6 +170,7 @@ typedef enum {
  **/
 typedef struct {
        gchar* exportname;    /**< (unprocessed) filename of the file we're exporting */
+       gchar* cowname;      /**< template for the filename of the copy-on-write file */
        off_t expected_size; /**< size of the exported file as it was told to
                               us through configuration */
        gchar* listenaddr;   /**< The IP address we're listening on */
@@ -558,6 +559,7 @@ GArray* parse_cfile(gchar* f, GError** e) {
                { "sparse_cow", FALSE,  PARAM_BOOL,     NULL, F_SPARSE },
                { "sdp",        FALSE,  PARAM_BOOL,     NULL, F_SDP },
                { "listenaddr", FALSE,  PARAM_STRING,   NULL, 0 },
+               { "cowname",    FALSE,  PARAM_STRING,   NULL, 0 },
        };
        const int lp_size=sizeof(lp)/sizeof(PARAM);
        PARAM gp[] = {
@@ -604,6 +606,9 @@ GArray* parse_cfile(gchar* f, GError** e) {
                lp[8].target=lp[9].target=lp[10].target=
                                lp[11].target=lp[12].target=&(s.flags);
                lp[13].target=&(s.listenaddr);
+               lp[14].target=&(s.cowname);
+
+               s.cowname = "$F-$I-$P.diff";
 
                /* After the [generic] group, start parsing exports */
                if(i==1) {