diff --git a/doc/man/s3fs.1 b/doc/man/s3fs.1 index 9d41c82..19f42c2 100644 --- a/doc/man/s3fs.1 +++ b/doc/man/s3fs.1 @@ -5,6 +5,8 @@ S3FS \- FUSE-based file system backed by Amazon S3 .SS mounting .TP \fBs3fs bucket[:/path] mountpoint \fP [options] +.TP +\fBs3fs mountpoint \fP [options(must specify bucket= option)] .SS unmounting .TP \fBumount mountpoint @@ -48,6 +50,9 @@ FUSE singlethreaded option (disables multi-threaded operation) All s3fs options must given in the form where "opt" is: = .TP +\fB\-o\fR bucket +if it is not specified bucket name(and path) in command line, must specify this option after \-o option for bucket name. +.TP \fB\-o\fR default_acl (default="private") the default canned acl to apply to all written S3 objects, e.g., "public-read". Any created files will have this canned acl. diff --git a/src/s3fs.cpp b/src/s3fs.cpp index 6c571ab..194acee 100644 --- a/src/s3fs.cpp +++ b/src/s3fs.cpp @@ -178,6 +178,7 @@ static int check_passwd_file_perms(void); static int read_passwd_file(void); static int get_access_keys(void); static int set_moutpoint_attribute(struct stat& mpst); +static int set_bucket(const char* arg); static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_args* outargs); // fuse interface functions diff --git a/src/s3fs_util.cpp b/src/s3fs_util.cpp index 56ac6e2..b50d937 100644 --- a/src/s3fs_util.cpp +++ b/src/s3fs_util.cpp @@ -905,6 +905,17 @@ void show_help (void) "\n" "Mount an Amazon S3 bucket as a file system.\n" "\n" + "Usage:\n" + " mounting\n" + " s3fs bucket[:/path] mountpoint [options]\n" + " s3fs mountpoint [options(must specify bucket= option)]\n" + "\n" + " umounting\n" + " umount mountpoint\n" + "\n" + " utility mode (remove interrupted multipart uploading objects)\n" + " s3fs -u bucket\n" + "\n" " General forms for s3fs and FUSE/mount options:\n" " -o opt[,opt...]\n" " -o opt [-o opt] ...\n" @@ -915,10 +926,14 @@ void show_help (void) "\n" " =\n" "\n" + " bucket\n" + " - if it is not specified bucket name(and path) in command line,\n" + " must specify this option after -o option for bucket name.\n" + "\n" " default_acl (default=\"private\")\n" - " - the default canned acl to apply to all written s3 objects\n" - " see http://aws.amazon.com/documentation/s3/ for the \n" - " full list of canned acls\n" + " - the default canned acl to apply to all written s3 objects\n" + " see http://aws.amazon.com/documentation/s3/ for the \n" + " full list of canned acls\n" "\n" " retries (default=\"2\")\n" " - number of times to retry a failed s3 transaction\n"