Merge pull request #25 from 815331793/revert-23-master

Revert "optimize the mount bucket process"

Author: jimmyyan

configure.ac

@@ -18,7 +18,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(cosfs, 1.0.10)
+AC_INIT(cosfs, 1.0.9)
 AC_CONFIG_HEADER([config.h])
 
 AC_CANONICAL_SYSTEM

src/curl.cpp

@@ -2570,25 +2570,17 @@ int S3fsCurl::CheckBucket(void)
   }
   string resource;
   string turl;
-  MakeUrlResource(get_realpath("/").c_str(), resource, turl);
+  MakeUrlResource("/", resource, turl);
 
   url             = prepare_url(turl.c_str());
-  path            = get_realpath("/");
+  path            = "/";
   requestHeaders  = NULL;
   responseHeaders.clear();
   bodydata        = new BodyData();
 
   string date    = get_date_rfc850();
   requestHeaders = curl_slist_sort_insert(requestHeaders, "Date", date.c_str());
 
-  //limit the number of objects returned if it is a GET Bucket request
-  if(mount_prefix.empty()){
-    url += "?";
-    url += "delimiter=/";
-    url += "&max-keys=2";
-    url += "&prefix=/";
-  }
-
   if(!S3fsCurl::IsPublicBucket()){
 	  string Signature = CalcSignature("GET", "", "", date, resource);
 	  requestHeaders   = curl_slist_sort_insert(requestHeaders, "Authorization", Signature.c_str());

src/s3fs.cpp

@@ -3391,6 +3391,14 @@ static int s3fs_removexattr(const char* path, const char* name)
 
 static void* s3fs_init(struct fuse_conn_info* conn)
 {
+  // check bucket
+  {
+       int result;
+       if (EXIT_SUCCESS != (result = s3fs_check_service())) {
+           s3fs_exit_fuseloop(result);
+           return NULL;
+       }
+  }
   // Investigate system capabilities
   #ifndef __APPLE__
   if((unsigned int)conn->capable & FUSE_CAP_ATOMIC_O_TRUNC){