Skip to content

Commit 768099c

Browse files
committed
Trim excess whitespace
1 parent df84927 commit 768099c

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

ChangeLog.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ Release 3.7.2 (2021-06-08)
55
tried - returning EEXIST if the access was successful.
66
Fixes: https://github.com/libfuse/sshfs/issues/243
77

8-
98
Release 3.7.1 (2020-11-09)
109
--------------------------
1110

1211
* Minor bugfixes.
1312

14-
1513
Release 3.7.0 (2020-01-03)
1614
--------------------------
1715

@@ -25,7 +23,6 @@ Release 3.7.0 (2020-01-03)
2523
needed anymore. If you depend on this workaround, please let the SSHFS maintainers know,
2624
otherwise support for the workaround will be removed completely in a future version.
2725

28-
2926
Release 3.6.0 (2019-11-03)
3027
--------------------------
3128

@@ -38,7 +35,6 @@ Release 3.6.0 (2019-11-03)
3835
* Fixed a number of compiler warnings.
3936
* Improved performance under OS X.
4037

41-
4238
Release 3.5.2 (2019-04-13)
4339
--------------------------
4440

cache.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ static int cache_readlink(const char *path, char *buf, size_t size)
300300
return err;
301301
}
302302

303-
304303
static int cache_opendir(const char *path, struct fuse_file_info *fi)
305304
{
306305
(void) path;

sshfs.rst

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,16 @@ By default, only the mounting user will be able to access the filesystem. Access
4040
users can be enabled by passing ``-o allow_other``. In this case you most likely also
4141
want to use ``-o default_permissions``.
4242

43-
It is recommended to run SSHFS as regular user (not as root). For this to work the
44-
mountpoint must be owned by the user. If username is omitted SSHFS will use the local
45-
username. If the directory is omitted, SSHFS will mount the (remote) home directory. If
43+
It is recommended to run SSHFS as regular user (not as root). For this to work the
44+
mountpoint must be owned by the user. If username is omitted SSHFS will use the local
45+
username. If the directory is omitted, SSHFS will mount the (remote) home directory. If
4646
you need to enter a password SSHFS will ask for it (actually it just runs ssh which ask
4747
for the password if needed).
4848

4949

5050
Options
5151
=======
5252

53-
5453
-o opt,[opt...]
5554
mount options, see below for details. A a variety of SSH options can
5655
be given here as well, see the manual pages for *sftp(1)* and
@@ -158,7 +157,7 @@ Options
158157

159158
-o passive
160159
communicate over stdin and stdout bypassing network. Useful for
161-
mounting local filesystem on the remote side. An example using
160+
mounting local filesystem on the remote side. An example using
162161
dpipe command would be ``dpipe /usr/lib/openssh/sftp-server = ssh
163162
RemoteHostname sshfs :/directory/to/be/shared ~/mnt/src -o passive``
164163

@@ -186,7 +185,7 @@ Options
186185
read password from stdin (only for pam_mount!)
187186

188187
-o dir_cache=BOOL
189-
Enables (*yes*) or disables (*no*) the SSHFS directory cache. The
188+
Enables (*yes*) or disables (*no*) the SSHFS directory cache. The
190189
directory cache holds the names of directory entries. Enabling it
191190
allows `readdir(3)` system calls to be processed without network
192191
access.
@@ -198,7 +197,7 @@ Options
198197
sets timeout for directory cache in seconds.
199198

200199
-o dcache_{stat,link,dir}_timeout=N
201-
sets separate timeout for {attributes, symlinks, names} in the
200+
sets separate timeout for {attributes, symlinks, names} in the
202201
directory cache.
203202

204203
-o dcache_clean_interval=N
@@ -263,8 +262,8 @@ Permission denied when moving files across remote filesystems
263262
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
264263

265264
Most SFTP servers return only a generic "failure" when failing to rename
266-
across filesystem boundaries (EXDEV). SSHFS normally converts this generic
267-
failure to a permission denied error (EPERM). If the option ``-o
265+
across filesystem boundaries (EXDEV). SSHFS normally converts this generic
266+
failure to a permission denied error (EPERM). If the option ``-o
268267
workaround=renamexdev`` is given, generic failures will be considered EXDEV
269268
errors which will make programs like `mv(1)` attempt to actually move the
270269
file after the failed rename.

test/util.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ def cleanup(mount_process, mnt_dir):
3030
except subprocess.TimeoutExpired:
3131
mount_process.kill()
3232

33-
3433
def umount(mount_process, mnt_dir):
3534
subprocess.check_call(['fusermount3', '-z', '-u', mnt_dir ])
3635
assert not os.path.ismount(mnt_dir)

0 commit comments

Comments
 (0)