From: <cw...@ch...> - 2012-02-07 16:10:28
|
From: Chris Wolfe <cw...@ch...> Verified with `cat -vet` and `grep '\s$'` Trying again with git send-email. Hopefully it will refrain from trimming the trailing whitespace this patch is supposed to remove. --- sshfs.1 | 6 +++--- sshfs.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sshfs.1 b/sshfs.1 index 9dcd8aa..99d1e05 100644 --- a/sshfs.1 +++ b/sshfs.1 @@ -162,7 +162,7 @@ allow access to root \fB\-o\fR nonempty allow mounts over non\-empty file/dir .HP -\fB\-o\fR default_permissions +\fB\-o\fR default_permissions enable permission checking by kernel .TP \fB\-o\fR fsname=NAME @@ -237,7 +237,7 @@ perform reads asynchronously (default) \fB\-o\fR sync_read perform reads synchronously .SS "Module options:" -.TP +.TP [subdir] .TP \fB\-o\fR subdir=DIR @@ -245,7 +245,7 @@ prepend this directory to all paths (mandatory) .TP \fB\-o\fR [no]rellinksa transform absolute symlinks to relative -.TP +.TP [iconv] .TP \fB\-o\fR from_code=CHARSET diff --git a/sshfs.c b/sshfs.c index bf7e956..32c0002 100644 --- a/sshfs.c +++ b/sshfs.c @@ -2486,7 +2486,7 @@ static struct read_chunk *sshfs_send_read(struct sshfs_file *sf, size_t size, buf_add_uint64(&buf, offset); buf_add_uint32(&buf, bsize); buf_to_iov(&buf, &iov[0]); - err = sftp_request_send(SSH_FXP_READ, iov, 1, + err = sftp_request_send(SSH_FXP_READ, iov, 1, sshfs_read_begin, sshfs_read_end, 0, rreq, NULL); @@ -2575,7 +2575,7 @@ static void submit_read(struct sshfs_file *sf, size_t size, off_t offset, struct read_chunk *chunk; chunk = sshfs_send_read(sf, size, offset); - pthread_mutex_lock(&sshfs.lock); + pthread_mutex_lock(&sshfs.lock); chunk->modifver = sshfs.modifver; chunk_put(*chunkp); *chunkp = chunk; @@ -3355,7 +3355,7 @@ static void set_ssh_command(void) replace_arg(&sshfs.ssh_args.argv[0], sshfs.ssh_command); } else { - if (fuse_opt_insert_arg(&sshfs.ssh_args, i, + if (fuse_opt_insert_arg(&sshfs.ssh_args, i, sshfs.ssh_command) == -1) _exit(1); } @@ -3760,7 +3760,7 @@ int main(int argc, char *argv[]) int foreground; struct stat st; - res = fuse_parse_cmdline(&args, &mountpoint, &multithreaded, + res = fuse_parse_cmdline(&args, &mountpoint, &multithreaded, &foreground); if (res == -1) exit(1); -- 1.7.7.3 |