Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r923526 - in /couchdb/trunk/src/couchdb: couch_server.erl
 couch_util.erl
Date: Tue, 16 Mar 2010 00:44:22 -0000
To: commits@couchdb.apache.org
From: davisp@apache.org
Message-Id: <20100316004422.3132423889E7@eris.apache.org>

Author: davisp
Date: Tue Mar 16 00:44:21 2010
New Revision: 923526

URL: http://svn.apache.org/viewvc?rev=923526&view=rev
Log:
Fixes couch_server:all_databases/0

The logic was failing when the database path had a '.' path component
in the middle because Filename -- Root is not a prefix operation. This
patch adds a normalization function to couch_util that is run on the
Root and Filename variables before doing the array subtraction. I could
probably make it smarter and error out but I got lazy.


Modified:
    couchdb/trunk/src/couchdb/couch_server.erl
    couchdb/trunk/src/couchdb/couch_util.erl

Modified: couchdb/trunk/src/couchdb/couch_server.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_server.erl?rev=923526&r1=923525&r2=923526&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_server.erl (original)
+++ couchdb/trunk/src/couchdb/couch_server.erl Tue Mar 16 00:44:21 2010
@@ -153,10 +153,12 @@ terminate(Reason, _Srv) ->
 
 all_databases() ->
     {ok, #server{root_dir=Root}} = gen_server:call(couch_server, get_server),
+    NormRoot = couch_util:normpath(Root),
     Filenames =
     filelib:fold_files(Root, "^[a-z0-9\\_\\$()\\+\\-]*[\\.]couch$", true,
         fun(Filename, AccIn) ->
-            case Filename -- Root of
+            NormFilename = couch_util:normpath(Filename),
+            case NormFilename -- NormRoot of
             [$/ | RelativeFilename] -> ok;
             RelativeFilename -> ok
             end,

Modified: couchdb/trunk/src/couchdb/couch_util.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_util.erl?rev=923526&r1=923525&r2=923526&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_util.erl (original)
+++ couchdb/trunk/src/couchdb/couch_util.erl Tue Mar 16 00:44:21 2010
@@ -12,7 +12,7 @@
 
 -module(couch_util).
 
--export([priv_dir/0, start_driver/1,terminate_linked/1]).
+-export([priv_dir/0, start_driver/1, normpath/1, terminate_linked/1]).
 -export([should_flush/0, should_flush/1, to_existing_atom/1]).
 -export([rand32/0, implode/2, collate/2, collate/3]).
 -export([abs_pathname/1,abs_pathname/2, trim/1, ascii_lower/1]).
@@ -50,6 +50,19 @@ start_driver(LibDir) ->
         exit(erl_ddll:format_error(Error))
     end.
 
+% Normalize a pathname by removing .. and . components.
+normpath(Path) ->
+    normparts(filename:split(Path), []).
+
+normparts([], Acc) ->
+    filename:join(lists:reverse(Acc));
+normparts([".." | RestParts], [_Drop | RestAcc]) ->
+    normparts(RestParts, RestAcc);
+normparts(["." | RestParts], Acc) ->
+    normparts(RestParts, Acc);
+normparts([Part | RestParts], Acc) ->
+    normparts(RestParts, [Part | Acc]).
+
 % works like list_to_existing_atom, except can be list or binary and it
 % gives you the original value instead of an error if no existing atom.
 to_existing_atom(V) when is_list(V) ->