one more round of walker cleanup: remove some items that are internal to the

    FS provider from the public API; bang up the FS internals for the
    now-private items and mechanisms; a bit more revamp to the FS walker
    top-level APIs to narrow in on obsoleting dav_walker_ctx.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86886 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c
index ac9de839256f74241b7705de9f1a0b78d556f4e7..546883f362b5589e07d537e60b507d2258e84583 100644 (file)
--- a/modules/dav/fs/repos.c
+++ b/modules/dav/fs/repos.c
@@ -90,18 +90,41 @@ typedef struct {
     dav_walk_resource wres;
 
     dav_resource res1;
-    dav_resource res2;
     dav_resource_private info1;
-    dav_resource_private info2;
     dav_buffer path1;
-    dav_buffer path2;
+    dav_buffer uri_buf;
 
-    dav_buffer uri_buf; /* URI for res1 */
+    /* MOVE/COPY need a secondary path */
+    dav_resource res2;
+    dav_resource_private info2;
+    dav_buffer path2;
 
     dav_buffer locknull_buf;
 
 } dav_fs_walker_context;
 
+typedef struct {
+    int is_move;                /* is this a MOVE? */
+    dav_buffer work_buf;        /* handy buffer for copymove_file() */
+
+    /* CALLBACK: this is a secondary resource managed specially for us */
+    const dav_resource *res_dst;
+
+    /* copied from dav_walk_params (they are invariant across the walk) */
+    const dav_resource *root;
+    apr_pool_t *pool;
+
+} dav_fs_copymove_walk_ctx;
+
+/* an internal WALKTYPE to walk hidden files (the .DAV directory) */
+#define DAV_WALKTYPE_HIDDEN    0x4000
+
+/* an internal WALKTYPE to call collections (again) after their contents */
+#define DAV_WALKTYPE_POSTFIX    0x8000
+
+#define DAV_CALLTYPE_POSTFIX    1000    /* a private call type */
+
+
 /* pull this in from the other source file */
 extern const dav_hooks_locks dav_hooks_locks_fs;
 
@@ -186,6 +209,10 @@ struct dav_stream {
 
 /* forward declaration for internal treewalkers */
 static dav_error * dav_fs_walk(dav_walker_ctx *wctx, int depth);
+static dav_error * dav_fs_internal_walk(const dav_walk_params *params,
+                                        int depth, int is_move,
+                                        const dav_resource *root_dst,
+                                        dav_response **response);
 
 /* --------------------------------------------------------------------
 **
@@ -916,9 +943,9 @@ static dav_error * dav_fs_create_collection(dav_resource *resource)
 static dav_error * dav_fs_copymove_walker(dav_walk_resource *wres,
                                           int calltype)
 {
-    dav_walker_ctx *ctx = wres->walk_ctx;
+    dav_fs_copymove_walk_ctx *ctx = wres->walk_ctx;
     dav_resource_private *srcinfo = wres->resource->info;
-    dav_resource_private *dstinfo = wres->res_dst->info;
+    dav_resource_private *dstinfo = ctx->res_dst->info;
     dav_error *err = NULL;
 
     if (wres->resource->collection) {
@@ -932,15 +959,15 @@ static dav_error * dav_fs_copymove_walker(dav_walk_resource *wres,
         else {
            /* copy/move of a collection. Create the new, target collection */
             if (apr_make_dir(dstinfo->pathname, APR_OS_DEFAULT,
-                             ctx->w.pool) != APR_SUCCESS) {
+                             ctx->pool) != APR_SUCCESS) {
                /* ### assume it was a permissions problem */
                /* ### need a description here */
-                err = dav_new_error(ctx->w.pool, HTTP_FORBIDDEN, 0, NULL);
+                err = dav_new_error(ctx->pool, HTTP_FORBIDDEN, 0, NULL);
             }
        }
     }
     else {
-       err = dav_fs_copymove_file(ctx->is_move, ctx->w.pool, 
+       err = dav_fs_copymove_file(ctx->is_move, ctx->pool, 
                                   srcinfo->pathname, dstinfo->pathname, 
                                   &ctx->work_buf);
        /* ### push a higher-level description? */
@@ -961,7 +988,7 @@ static dav_error * dav_fs_copymove_walker(dav_walk_resource *wres,
     if (err != NULL
         && !ap_is_HTTP_SERVER_ERROR(err->status)
        && (ctx->is_move
-            || !dav_fs_is_same_resource(wres->resource, ctx->w.root))) {
+            || !dav_fs_is_same_resource(wres->resource, ctx->root))) {
        /* ### use errno to generate DAV:responsedescription? */
        dav_add_response(wres, err->status, NULL);
 
@@ -988,27 +1015,29 @@ static dav_error *dav_fs_copymove_resource(
      * including the state dirs
      */
     if (src->collection) {
-       dav_walker_ctx ctx = { { 0 } };
+        dav_walk_params params = { 0 };
+        dav_response *multi_status;
 
-       ctx.w.walk_type = DAV_WALKTYPE_ALL | DAV_WALKTYPE_HIDDEN;
-       ctx.w.func = dav_fs_copymove_walker;
-        ctx.w.walk_ctx = &ctx;
-       ctx.w.pool = src->info->pool;
-       ctx.w.root = src;
-       ctx.w.root_dst = dst;
+       params.walk_type = DAV_WALKTYPE_NORMAL | DAV_WALKTYPE_HIDDEN;
+       params.func = dav_fs_copymove_walker;
+       params.pool = src->info->pool;
+       params.root = src;
 
-       ctx.is_move = is_move;
+        /* params.walk_ctx is managed by dav_fs_internal_walk() */
 
        /* postfix is needed for MOVE to delete source dirs */
         if (is_move)
-            ctx.w.walk_type |= DAV_WALKTYPE_POSTFIX;
+            params.walk_type |= DAV_WALKTYPE_POSTFIX;
+
+        /* note that we return the error OR the multistatus. never both */
 
-       if ((err = dav_fs_walk(&ctx, depth)) != NULL) {
+       if ((err = dav_fs_internal_walk(&params, depth, is_move, dst,
+                                        &multi_status)) != NULL) {
             /* on a "real" error, then just punt. nothing else to do. */
             return err;
         }
 
-        if ((*response = ctx.response) != NULL) {
+        if ((*response = multi_status) != NULL) {
             /* some multistatus responses exist. wrap them in a 207 */
             return dav_new_error(src->info->pool, HTTP_MULTI_STATUS, 0,
                                  "Error(s) occurred on some resources during "
@@ -1225,7 +1254,7 @@ static dav_error * dav_fs_remove_resource(dav_resource *resource,
        dav_walker_ctx ctx = { { 0 } };
        dav_error *err = NULL;
 
-       ctx.w.walk_type = (DAV_WALKTYPE_ALL
+       ctx.w.walk_type = (DAV_WALKTYPE_NORMAL
                            | DAV_WALKTYPE_HIDDEN
                            | DAV_WALKTYPE_POSTFIX);
        ctx.w.func = dav_fs_delete_walker;
@@ -1538,11 +1567,14 @@ static dav_error * dav_fs_walker(dav_fs_walker_context *fsctx, int depth)
     return NULL;
 }
 
-static dav_error * dav_fs_walk(dav_walker_ctx *wctx, int depth)
+static dav_error * dav_fs_internal_walk(const dav_walk_params *params,
+                                        int depth, int is_move,
+                                        const dav_resource *root_dst,
+                                        dav_response **response)
 {
-    const dav_walk_params *params = &wctx->w;
     dav_fs_walker_context fsctx = { 0 };
     dav_error *err;
+    dav_fs_copymove_walk_ctx cm_ctx = { 0 };
 
 #if DAV_DEBUG
     if ((params->walk_type & DAV_WALKTYPE_LOCKNULL) != 0
@@ -1563,20 +1595,31 @@ static dav_error * dav_fs_walk(dav_walker_ctx *wctx, int depth)
     fsctx.res1.info = &fsctx.info1;
     fsctx.info1 = *params->root->info;
 
+    /* the pathname is stored in the path1 buffer */
     dav_buffer_init(params->pool, &fsctx.path1, fsctx.info1.pathname);
     fsctx.info1.pathname = fsctx.path1.buf;
 
-    if (params->root_dst != NULL) {
-       fsctx.res2 = *params->root_dst;
+    if (root_dst != NULL) {
+        /* internal call from the COPY/MOVE code. set it up. */
+
+        fsctx.wres.walk_ctx = &cm_ctx;
+        cm_ctx.is_move = is_move;
+        cm_ctx.res_dst = &fsctx.res2;
+        cm_ctx.root = params->root;
+        cm_ctx.pool = params->pool;
+
+       fsctx.res2 = *root_dst;
        fsctx.res2.exists = 0;
        fsctx.res2.collection = 0;
+        fsctx.res2.uri = NULL;          /* we don't track this */
 
        fsctx.res2.info = &fsctx.info2;
-       fsctx.info2 = *params->root_dst->info;
+       fsctx.info2 = *root_dst->info;
 
        /* res2 does not exist -- clear its finfo structure */
        memset(&fsctx.info2.finfo, 0, sizeof(fsctx.info2.finfo));
 
+        /* the pathname is stored in the path2 buffer */
        dav_buffer_init(params->pool, &fsctx.path2, fsctx.info2.pathname);
        fsctx.info2.pathname = fsctx.path2.buf;
     }
@@ -1593,20 +1636,26 @@ static dav_error * dav_fs_walk(dav_walker_ctx *wctx, int depth)
        fsctx.uri_buf.buf[fsctx.uri_buf.cur_len] = '\0';
     }
 
-    /*
-    ** URI is tracked in the walker context. Ensure that people do not try
-    ** to fetch it from res2. We will ensure that res1 and uri will remain
-    ** synchronized.
-    */
+    /* the current resource's URI is stored in the uri_buf buffer */
     fsctx.res1.uri = fsctx.uri_buf.buf;
-    fsctx.res2.uri = NULL;
 
-    /* use our resource structures */
+    /* point the callback's resource at our structure */
     fsctx.wres.resource = &fsctx.res1;
-    fsctx.wres.res_dst = &fsctx.res2;
 
+    /* always return the error, and any/all multistatus responses */
     err = dav_fs_walker(&fsctx, depth);
-    wctx->response = fsctx.wres.response;
+    *response = fsctx.wres.response;
+    return err;
+}
+
+static dav_error * dav_fs_walk(dav_walker_ctx *wctx, int depth)
+{
+    dav_response *response;
+    dav_error *err;
+
+    /* always return the error, and any/all multistatus responses */
+    err = dav_fs_internal_walk(&wctx->w, depth, 0, NULL, &response);
+    wctx->response = response;
     return err;
 }
 

diff --git a/modules/dav/main/mod_dav.h b/modules/dav/main/mod_dav.h
index daf2b5fd0bb016eab98ae504d179d6692dfdac2c..73571536db79f5e7fd7cf3a71da7bd6f75809045 100644 (file)
--- a/modules/dav/main/mod_dav.h
+++ b/modules/dav/main/mod_dav.h
@@ -1224,7 +1224,6 @@ enum {
     DAV_CALLTYPE_MEMBER = 1,   /* called for a member resource */
     DAV_CALLTYPE_COLLECTION,   /* called for a collection */
     DAV_CALLTYPE_LOCKNULL,     /* called for a locknull resource */
-    DAV_CALLTYPE_POSTFIX       /* postfix call for a collection */
 };
 
 typedef struct
@@ -1235,9 +1234,6 @@ typedef struct
     /* the current resource */
     const dav_resource *resource;
 
-    /* the current secondary/tracking resource */
-    const dav_resource *res_dst;
-
     /* OUTPUT: add responses to this */
     dav_response *response;
 
@@ -1250,11 +1246,6 @@ typedef struct
 #define DAV_WALKTYPE_NORMAL    0x0002  /* walk normal files */
 #define DAV_WALKTYPE_LOCKNULL  0x0004  /* walk locknull resources */
 
-#define DAV_WALKTYPE_POSTFIX    0x0100  /* do postfix call for collections */
-
-#define DAV_WALKTYPE_ALL       DAV_WALKTYPE_NORMAL     /* ### compat */
-#define DAV_WALKTYPE_HIDDEN    0x1000  /* walk hidden files */
-
     /* callback function and a client context for the walk */
     dav_error * (*func)(dav_walk_resource *wres, int calltype);
     void *walk_ctx;
@@ -1265,9 +1256,6 @@ typedef struct
     /* beginning root of the walk */
     const dav_resource *root;
 
-    /* secondary, tracking resource */
-    const dav_resource *root_dst;
-
     /* lock database to enable walking LOCKNULL resources */
     dav_lockdb *lockdb;
 
@@ -1283,7 +1271,7 @@ typedef struct dav_walker_ctx
     dav_response *response;
 
 
-    /* ### private data... phasing out this big glom */
+    /* ### client data... phasing out this big glom */
 
     request_rec *r;                    /* original request */
 
@@ -1296,10 +1284,6 @@ typedef struct dav_walker_ctx
 
     ap_text *propstat_404;     /* (cached) propstat giving a 404 error */
 
-    /* for COPY and MOVE operations */
-    int is_move;
-    dav_buffer work_buf;
-
     const dav_if_header *if_header;    /* for validation */
     const dav_locktoken *locktoken;    /* for UNLOCK */
     const dav_lock *lock;              /* for LOCK */
@@ -1307,6 +1291,8 @@ typedef struct dav_walker_ctx
 
     int flags;
 
+    dav_buffer work_buf;                /* for dav_validate_request() */
+
 } dav_walker_ctx;
 
 DAV_DECLARE(void) dav_add_response(dav_walk_resource *wres,