Permalink
Browse files

Accept -o cache_* options for backward compatibility.

Fixes: #73.
  • Loading branch information...
Nikratio committed Aug 3, 2017
1 parent 45710c8 commit 63300fd564de615ba70722347eea45afe1950a33
Showing with 22 additions and 0 deletions.
  1. +3 −0 ChangeLog.rst
  2. +13 −0 cache.c
  3. +6 −0 sshfs.c
View
@@ -4,6 +4,9 @@ Unreleased Changes
* Fixed a crash due to a race condition when listing
directory contents.
* For improved backwards compatibility, SSHFS now also silently
accepts the old ``-o cache_*`` options.
Release 3.0.0 (2017-07-08)
--------------------------
View
13 cache.c
@@ -586,6 +586,19 @@ static const struct fuse_opt cache_opts[] = {
clean_interval_secs), 0 },
{ "dcache_min_clean_interval=%u", offsetof(struct cache,
min_clean_interval_secs), 0 },
/* For backwards compatibility */
{ "cache_timeout=%u", offsetof(struct cache, stat_timeout_secs), 0 },
{ "cache_timeout=%u", offsetof(struct cache, dir_timeout_secs), 0 },
{ "cache_timeout=%u", offsetof(struct cache, link_timeout_secs), 0 },
{ "cache_stat_timeout=%u", offsetof(struct cache, stat_timeout_secs), 0 },
{ "cache_dir_timeout=%u", offsetof(struct cache, dir_timeout_secs), 0 },
{ "cache_link_timeout=%u", offsetof(struct cache, link_timeout_secs), 0 },
{ "cache_max_size=%u", offsetof(struct cache, max_size), 0 },
{ "cache_clean_interval=%u", offsetof(struct cache,
clean_interval_secs), 0 },
{ "cache_min_clean_interval=%u", offsetof(struct cache,
min_clean_interval_secs), 0 },
FUSE_OPT_END
};
View
@@ -423,7 +423,13 @@ static struct fuse_opt sshfs_opts[] = {
FUSE_OPT_KEY("-p ", KEY_PORT),
FUSE_OPT_KEY("-C", KEY_COMPRESS),
FUSE_OPT_KEY("-F ", KEY_CONFIGFILE),
/* For backwards compatibility */
SSHFS_OPT("cache=yes", dir_cache, 1),
SSHFS_OPT("cache=no", dir_cache, 0),
FUSE_OPT_END
};
static struct fuse_opt workaround_opts[] = {

0 comments on commit 63300fd

Please sign in to comment.