diff options
| author | Paul Joseph Davis <davisp@apache.org> | 2010-03-16 00:44:21 +0000 |
|---|---|---|
| committer | Paul Joseph Davis <davisp@apache.org> | 2010-03-16 00:44:21 +0000 |
| commit | 67313872c0fde033688369b6785fc42ab6c64770 (patch) | |
| tree | e19997ebbeaa67a8e21cd19fa8411f65bb334cde /src/couchdb/couch_server.erl | |
| parent | 17fd3e388668be4abf091b01f8f49db887bcddb5 (diff) | |
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.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@923526 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_server.erl')
| -rw-r--r-- | src/couchdb/couch_server.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl index ac3a5df3..e52bacfa 100644 --- a/src/couchdb/couch_server.erl +++ b/src/couchdb/couch_server.erl @@ -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, |