Return-Path: <bjh@apache.org>
Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Delivered-To: mailing list commits@apr.apache.org
Received: (qmail 98607 invoked by uid 99); 24 Nov 2004 10:45:33 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 24 Nov 2004 02:45:30 -0800
Received: (qmail 52818 invoked by uid 65534); 24 Nov 2004 10:18:23 -0000
Date: 24 Nov 2004 10:18:23 -0000
Message-ID: <20041124101823.52815.qmail@minotaur.apache.org>
From: bjh@apache.org
To: commits@apr.apache.org
Subject: svn commit: r106404 - /apr/apr/trunk/file_io/os2/dir.c
 /apr/apr/trunk/file_io/os2/dir_make_recurse.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Virus-Checked: Checked

Author: bjh
Date: Wed Nov 24 02:18:22 2004
New Revision: 106404

URL: http://svn.apache.org/viewcvs?view=rev&rev=106404
Log:
OS/2: Add implementation of apr_dir_make_recursive().


Added:
   apr/apr/trunk/file_io/os2/dir_make_recurse.c
Modified:
   apr/apr/trunk/file_io/os2/dir.c

Modified: apr/apr/trunk/file_io/os2/dir.c
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/file_io/os2/dir.c?view=diff&rev=106404&p1=apr/apr/trunk/file_io/os2/dir.c&r1=106403&p2=apr/apr/trunk/file_io/os2/dir.c&r2=106404
==============================================================================
--- apr/apr/trunk/file_io/os2/dir.c	(original)
+++ apr/apr/trunk/file_io/os2/dir.c	Wed Nov 24 02:18:22 2004
@@ -136,14 +136,6 @@
 
 
 
-apr_status_t apr_dir_make_recursive(const char *path, apr_fileperms_t perm,
-                                    apr_pool_t *pool) 
-{
-    return APR_ENOTIMPL;
-}
-
-
-
 APR_DECLARE(apr_status_t) apr_dir_remove(const char *path, apr_pool_t *pool)
 {
     return APR_FROM_OS_ERROR(DosDeleteDir(path));

Added: apr/apr/trunk/file_io/os2/dir_make_recurse.c
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/file_io/os2/dir_make_recurse.c?view=auto&rev=106404
==============================================================================
--- (empty file)
+++ apr/apr/trunk/file_io/os2/dir_make_recurse.c	Wed Nov 24 02:18:22 2004
@@ -0,0 +1,85 @@
+/* Copyright 2000-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_file_io.h"
+#include "apr_lib.h"
+#include "apr_strings.h"
+#include <string.h>
+
+#define IS_SEP(c) (c == '/' || c == '\\')
+
+/* Remove trailing separators that don't affect the meaning of PATH. */
+static const char *path_canonicalize(const char *path, apr_pool_t *pool)
+{
+    /* At some point this could eliminate redundant components.  For
+     * now, it just makes sure there is no trailing slash. */
+    apr_size_t len = strlen(path);
+    apr_size_t orig_len = len;
+
+    while ((len > 0) && IS_SEP(path[len - 1])) {
+        len--;
+    }
+
+    if (len != orig_len) {
+        return apr_pstrndup(pool, path, len);
+    }
+    else {
+        return path;
+    }
+}
+
+
+
+/* Remove one component off the end of PATH. */
+static char *path_remove_last_component(const char *path, apr_pool_t *pool)
+{
+    const char *newpath = path_canonicalize(path, pool);
+    int i;
+
+    for (i = strlen(newpath) - 1; i >= 0; i--) {
+        if (IS_SEP(path[i])) {
+            break;
+        }
+    }
+
+    return apr_pstrndup(pool, path, (i < 0) ? 0 : i);
+}
+
+
+
+apr_status_t apr_dir_make_recursive(const char *path, apr_fileperms_t perm,
+                                    apr_pool_t *pool)
+{
+    apr_status_t apr_err = APR_SUCCESS;
+    
+    apr_err = apr_dir_make(path, perm, pool); /* Try to make PATH right out */
+
+    if (APR_STATUS_IS_EEXIST(apr_err)) { /* It's OK if PATH exists */
+        return APR_SUCCESS;
+    }
+
+    if (APR_STATUS_IS_ENOENT(apr_err)) { /* Missing an intermediate dir */
+        char *dir;
+
+        dir = path_remove_last_component(path, pool);
+        apr_err = apr_dir_make_recursive(dir, perm, pool);
+
+        if (!apr_err) {
+            apr_err = apr_dir_make(path, perm, pool);
+        }
+    }
+
+    return apr_err;
+}