diff --git a/src/IOCoordinator.cpp b/src/IOCoordinator.cpp index 26d99b527..301b56ad8 100755 --- a/src/IOCoordinator.cpp +++ b/src/IOCoordinator.cpp @@ -358,9 +358,9 @@ int IOCoordinator::open(const char *filename, int openmode, struct stat *out) return meta.stat(out); } -int IOCoordinator::listDirectory(const char *filename, vector *listing) +int IOCoordinator::listDirectory(const char *dirname, vector *listing) { - bf::path p(metaPath / filename); + bf::path p(metaPath / dirname); listing->clear(); if (!bf::exists(p)) @@ -376,7 +376,7 @@ int IOCoordinator::listDirectory(const char *filename, vector *listing) bf::directory_iterator it(p), end; for (bf::directory_iterator it(p); it != end; it++) - listing->push_back(it->path().filename().string()); + listing->push_back(it->path().stem().string()); return 0; } diff --git a/src/unit_tests.cpp b/src/unit_tests.cpp index 961a76392..8275c2535 100755 --- a/src/unit_tests.cpp +++ b/src/unit_tests.cpp @@ -660,8 +660,10 @@ bool listdirtask() bf::create_directories(tmpPath); for (int i = 0; i < 10; i++) { + string file(tmpPath.string() + "/dummy" + to_string(i)); files.insert(file); + file += ".meta"; err = ::open(file.c_str(), O_CREAT | O_WRONLY, 0600); assert(err >= 0); fdMinders.push_back(err); @@ -687,7 +689,6 @@ bool listdirtask() assert(resp->header.flags == 0); assert(resp->returnCode == 0); listdir_resp *r = (listdir_resp *) resp->payload; - cout << "resp has " << r->elements << " elements" << endl; assert(r->elements == 10); int off = sizeof(sm_response) + sizeof(listdir_resp); int fileCounter = 0;