octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-17 17:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #346 from RobbKistler/empty-dir

Browse Source 
Fix empty directory check against AWS S3
This commit is contained in:
Takeshi Nakatani 2016-02-06 18:59:45 +09:00
commit 203df6b58a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/s3fs.cpp
View File

@ -2429,7 +2429,9 @@ static int list_bucket(const char* path, S3ObjList& head, const char* delimiter,
query_prefix += urlEncode(s3_realpath.substr(1)); query_prefix += urlEncode(s3_realpath.substr(1));
} }
if (check_content_only){ if (check_content_only){
query_maxkey += "max-keys=1"; // Just need to know if there are child objects in dir
// For dir with children, expect "dir/" and "dir/child"
query_maxkey += "max-keys=2";
}else{ }else{
query_maxkey += "max-keys=1000"; query_maxkey += "max-keys=1000";
} }
@ -2568,7 +2570,7 @@ static int append_objects_from_xml_ex(const char* path, xmlDocPtr doc, xmlXPathC
} }
free(name); free(name);
}else{ }else{
S3FS_PRN_WARN("name is file or subdir in dir. but continue."); S3FS_PRN_DBG("name is file or subdir in dir. but continue.");
} }
xmlXPathFreeObject(key); xmlXPathFreeObject(key);
} }