Re-enable the -f option for FUSE. (This got disabled

with the conversion to get_opt

-f is passed along to FUSE. This makes FUSE run
in foreground (non-daemon) mode and some debugging
messages now appear on STDOUT



git-svn-id: http://s3fs.googlecode.com/svn/trunk@240 df820570-a93a-0410-bd06-b72b767a4274
This commit is contained in:
mooredan@suncup.net 2010-11-19 22:23:38 +00:00
parent a587656914
commit 65e0a2ff84
2 changed files with 6 additions and 2 deletions

View File

@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT(s3fs, 1.12)
AC_INIT(s3fs, 1.13)
AC_CANONICAL_SYSTEM

View File

@ -1880,6 +1880,7 @@ static void show_help (void) {
" --version Output version info.\n"
" -d --debug Turn on DEBUG messages to syslog. Specifying -d\n"
" twice turns on FUSE debug messages to STDOUT.\n"
" -f FUSE foreground option - do not run as daemon.\n"
"\n"
"\n"
"Report bugs to <s3fs-devel@googlegroups.com>\n"
@ -2072,7 +2073,7 @@ int main(int argc, char *argv[]) {
program_name.replace(0, found+1, "");
}
while ((ch = getopt_long(argc, argv, "dho:", long_opts, &option_index)) != -1) {
while ((ch = getopt_long(argc, argv, "dho:f", long_opts, &option_index)) != -1) {
switch (ch) {
case 0:
if (strcmp(long_opts[option_index].name, "version") == 0) {
@ -2090,6 +2091,9 @@ int main(int argc, char *argv[]) {
case 'd':
break;
case 'f':
break;
default:
exit(1);
}