sshfs: Update to 3.5.1

1 files changed, 19 insertions, 19 deletions

diff --git a/pkg/sshfs/patch/0005-Use-standard-C-functions.patch b/pkg/sshfs/patch/0005-Use-standard-C-functions.patch
index 2718c796..26136a46 100644
--- a/pkg/sshfs/patch/0005-Use-standard-C-functions.patch
+++ b/pkg/sshfs/patch/0005-Use-standard-C-functions.patch
@@ -1,4 +1,4 @@
-From 4c05a5809a7c3bcda3c8a932c54b7e5f8afa1619 Mon Sep 17 00:00:00 2001
+From 5de918738fc0f3ee81d9928d89d4e5d0171b0c71 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sun, 5 Jun 2016 17:42:29 -0700
 Subject: [PATCH] Use standard C functions
@@ -8,10 +8,10 @@ Subject: [PATCH] Use standard C functions
  1 file changed, 55 insertions(+), 36 deletions(-)
 
 diff --git a/sshfs.c b/sshfs.c
-index d33a7c9..d8f2461 100644
+index 28fcaf4..4650372 100644
 --- a/sshfs.c
 +++ b/sshfs.c
-@@ -666,25 +666,25 @@ static inline void buf_add_path(struct buffer *buf, const char *path)
+@@ -667,25 +667,25 @@ static inline void buf_add_path(struct buffer *buf, const char *path)
  	if (sshfs.base_path[0]) {
  		if (path[1]) {
  			if (sshfs.base_path[strlen(sshfs.base_path)-1] != '/') {
@@ -47,7 +47,7 @@ index d33a7c9..d8f2461 100644
  }
  
  static int buf_check_get(struct buffer *buf, size_t len)
-@@ -1269,7 +1269,7 @@ static void request_free(struct request *req)
+@@ -1270,7 +1270,7 @@ static void request_free(struct request *req)
  {
  	buf_free(&req->reply);
  	sem_destroy(&req->ready);
@@ -56,7 +56,7 @@ index d33a7c9..d8f2461 100644
  }
  
  static int request_table_insert(struct request_table *reqtab, struct request *req)
-@@ -1317,9 +1317,9 @@ static void chunk_free(struct read_chunk *chunk)
+@@ -1318,9 +1318,9 @@ static void chunk_free(struct read_chunk *chunk)
  		rreq = list_entry(chunk->reqs.prev, struct read_req, list);
  		list_del(&rreq->list);
  		buf_free(&rreq->data);
@@ -68,7 +68,7 @@ index d33a7c9..d8f2461 100644
  }
  
  static void chunk_put(struct read_chunk *chunk)
-@@ -1870,8 +1870,10 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1871,8 +1871,10 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
                               struct request **reqp)
  {
  	int err;
@@ -80,7 +80,7 @@ index d33a7c9..d8f2461 100644
  	req->want_reply = want_reply;
  	req->end_func = end_func;
  	req->data = data;
-@@ -2580,8 +2582,10 @@ static int sshfs_open_common(const char *path, mode_t mode,
+@@ -2581,8 +2583,10 @@ static int sshfs_open_common(const char *path, mode_t mode,
  
  	if (fi->flags & O_APPEND)
  		pflags |= SSH_FXF_APPEND;
@@ -93,7 +93,7 @@ index d33a7c9..d8f2461 100644
  	list_init(&sf->write_reqs);
  	pthread_cond_init(&sf->write_finished, NULL);
  	/* Assume random read after open */
-@@ -2625,7 +2629,7 @@ static int sshfs_open_common(const char *path, mode_t mode,
+@@ -2626,7 +2630,7 @@ static int sshfs_open_common(const char *path, mode_t mode,
  	} else {
  		if (sshfs.dir_cache)
  			cache_invalidate(path);
@@ -102,7 +102,7 @@ index d33a7c9..d8f2461 100644
  	}
  	buf_free(&buf);
  	return err;
-@@ -2692,7 +2696,7 @@ static void sshfs_file_put(struct sshfs_file *sf)
+@@ -2693,7 +2697,7 @@ static void sshfs_file_put(struct sshfs_file *sf)
  {
  	sf->refs--;
  	if (!sf->refs)
@@ -111,7 +111,7 @@ index d33a7c9..d8f2461 100644
  }
  
  static void sshfs_file_get(struct sshfs_file *sf)
-@@ -2762,9 +2766,11 @@ static void sshfs_read_begin(struct request *req)
+@@ -2763,9 +2767,11 @@ static void sshfs_read_begin(struct request *req)
  static struct read_chunk *sshfs_send_read(struct sshfs_file *sf, size_t size,
  					  off_t offset)
  {
@@ -124,7 +124,7 @@ index d33a7c9..d8f2461 100644
  	pthread_cond_init(&chunk->sio.finished, NULL);
  	list_init(&chunk->reqs);
  	chunk->size = size;
-@@ -2778,7 +2784,9 @@ static struct read_chunk *sshfs_send_read(struct sshfs_file *sf, size_t size,
+@@ -2779,7 +2785,9 @@ static struct read_chunk *sshfs_send_read(struct sshfs_file *sf, size_t size,
  		struct read_req *rreq;
  		size_t bsize = size < sshfs.max_read ? size : sshfs.max_read;
  
@@ -135,7 +135,7 @@ index d33a7c9..d8f2461 100644
  		rreq->sio = &chunk->sio;
  		rreq->size = bsize;
  		buf_init(&rreq->data, 0);
-@@ -2849,7 +2857,7 @@ static int wait_chunk(struct read_chunk *chunk, char *buf, size_t size)
+@@ -2850,7 +2858,7 @@ static int wait_chunk(struct read_chunk *chunk, char *buf, size_t size)
  			size -= rreq->res;
  			list_del(&rreq->list);
  			buf_free(&rreq->data);
@@ -144,7 +144,7 @@ index d33a7c9..d8f2461 100644
  		}
  	}
  
-@@ -3472,9 +3480,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3473,9 +3481,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
  	switch (key) {
  	case FUSE_OPT_KEY_OPT:
  		if (is_ssh_opt(arg)) {
@@ -157,7 +157,7 @@ index d33a7c9..d8f2461 100644
  			return 0;
  		}
  		/* Pass through */
-@@ -3531,9 +3540,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3532,9 +3541,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
  
  
  	case KEY_PORT:
@@ -170,7 +170,7 @@ index d33a7c9..d8f2461 100644
  		return 0;
  
  	case KEY_COMPRESS:
-@@ -3541,9 +3551,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3542,9 +3552,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
  		return 0;
  
  	case KEY_CONFIGFILE:
@@ -183,7 +183,7 @@ index d33a7c9..d8f2461 100644
  		return 0;
  
  	default:
-@@ -3699,17 +3710,19 @@ static char *find_base_path(void)
+@@ -3700,17 +3711,19 @@ static char *find_base_path(void)
  
  static char *fsname_escape_commas(char *fsnameold)
  {
@@ -205,7 +205,7 @@ index d33a7c9..d8f2461 100644
  
  	return fsname;
  }
-@@ -4046,15 +4059,20 @@ int main(int argc, char *argv[])
+@@ -4047,15 +4060,20 @@ int main(int argc, char *argv[])
  	else
  		sshfs.max_outstanding_len = ~0;
  
@@ -230,7 +230,7 @@ index d33a7c9..d8f2461 100644
  	ssh_add_arg(sshfs.host);
  	if (sshfs.sftp_server)
  		sftp_server = sshfs.sftp_server;
-@@ -4081,10 +4099,11 @@ int main(int argc, char *argv[])
+@@ -4082,10 +4100,11 @@ int main(int argc, char *argv[])
  		sshfs.max_write = 65536;
  
          fsname = fsname_escape_commas(fsname);
@@ -246,5 +246,5 @@ index d33a7c9..d8f2461 100644
  	if(sshfs.dir_cache)
  		sshfs.op = cache_wrap(&sshfs_oper);
 -- 
-2.18.0
+2.19.2