Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: removal of trailing whitespace #257

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP: removal of trailing whitespace #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dae347a
Consistently use uppercase SSHFS
a1346054 Sep 16, 2021
4ae53ba
Trim excess whitespace
a1346054 Aug 24, 2021
756cec6
Add .editorconfig file for style consistency
a1346054 Aug 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# https://EditorConfig.org

# top-most EditorConfig file
root = true

[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
4 changes: 0 additions & 4 deletions ChangeLog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ Release 3.7.2 (2021-06-08)
tried - returning EEXIST if the access was successful.
Fixes: https://github.com/libfuse/sshfs/issues/243


Release 3.7.1 (2020-11-09)
--------------------------

* Minor bugfixes.


Release 3.7.0 (2020-01-03)
--------------------------

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


Release 3.6.0 (2019-11-03)
--------------------------

Expand All @@ -53,7 +50,6 @@ Release 3.6.0 (2019-11-03)
* Fixed a number of compiler warnings.
* Improved performance under OS X.


Release 3.5.2 (2019-04-13)
--------------------------

Expand Down
1 change: 0 additions & 1 deletion cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ static int cache_readlink(const char *path, char *buf, size_t size)
return err;
}


static int cache_opendir(const char *path, struct fuse_file_info *fi)
{
(void) path;
Expand Down
19 changes: 9 additions & 10 deletions sshfs.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,16 @@ By default, only the mounting user will be able to access the filesystem. Access
users can be enabled by passing ``-o allow_other``. In this case you most likely also
want to use ``-o default_permissions``.

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


Options
=======


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

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

Expand Down Expand Up @@ -186,7 +185,7 @@ Options
read password from stdin (only for pam_mount!)

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

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

-o dcache_clean_interval=N
Expand Down Expand Up @@ -263,8 +262,8 @@ Permission denied when moving files across remote filesystems
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Most SFTP servers return only a generic "failure" when failing to rename
across filesystem boundaries (EXDEV). sshfs normally converts this generic
failure to a permission denied error (EPERM). If the option ``-o
across filesystem boundaries (EXDEV). SSHFS normally converts this generic
failure to a permission denied error (EPERM). If the option ``-o
workaround=renamexdev`` is given, generic failures will be considered EXDEV
errors which will make programs like `mv(1)` attempt to actually move the
file after the failed rename.
Expand Down
1 change: 0 additions & 1 deletion test/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ def cleanup(mount_process, mnt_dir):
except subprocess.TimeoutExpired:
mount_process.kill()


def umount(mount_process, mnt_dir):
subprocess.check_call(['fusermount3', '-z', '-u', mnt_dir ])
assert not os.path.ismount(mnt_dir)
Expand Down