summaryrefslogtreecommitdiff
path: root/sysutils/fusefs-sshfs/files/patch-sshfs.c
blob: 629d99af3de0a1bccd14eb968fc9d047c41c6ac6 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
--- sshfs.c.orig	Fri Oct 28 08:15:35 2005
+++ sshfs.c	Mon Oct 31 02:59:33 2005
@@ -14,7 +14,11 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+	#include <stdint.h>
+#elif defined(HAVE_INTTYPES_H)
+	#include <inttypes.h>
+#endif
 #include <errno.h>
 #include <semaphore.h>
 #include <pthread.h>
@@ -24,6 +28,13 @@
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <glib.h>
+#ifdef __FreeBSD__
+	#include <sys/socket.h>
+	#include <sys/param.h>
+	#if (__FreeBSD_version < 600034)
+		#define	EPROTONOSUPPORT	43
+	#endif
+#endif
 
 #include "cache.h"
 #include "opts.h"
@@ -1070,7 +1081,11 @@
         err = req->error;
         goto out;
     }
+#ifdef EPROTO
     err = -EPROTO;
+#else
+    err = -EPROTONOSUPPORT;
+#endif
     if (req->reply_type != expect_type && req->reply_type != SSH_FXP_STATUS) {
         fprintf(stderr, "protocol error\n");
         goto out;
@@ -1085,21 +1100,35 @@
             if (expect_type == SSH_FXP_STATUS)
                 err = 0;
             else
+#ifdef EPROTO
                 err = -EPROTO;
+#else
+                err = -EPROTONOSUPPORT;
+#endif
             break;
 
         case SSH_FX_EOF:
             if (type == SSH_FXP_READ || type == SSH_FXP_READDIR)
                 err = MY_EOF;
             else
+#ifdef EPROTO
                 err = -EPROTO;
+#else
+                err = -EPROTONOSUPPORT;
+#endif
             break;
 
         case SSH_FX_NO_SUCH_FILE:      err = -ENOENT; break;
         case SSH_FX_PERMISSION_DENIED: err = -EACCES; break;
         case SSH_FX_FAILURE:           err = -EPERM;  break;
         case SSH_FX_BAD_MESSAGE:
-        default:                       err = -EPROTO; break;
+        default:
+#ifdef EPROTO
+                err = -EPROTO;
+#else
+                err = -EPROTONOSUPPORT;
+#endif
+                break;
         }
     } else {
         buf_init(outbuf, req->reply.size - req->reply.len);
@@ -1142,7 +1171,11 @@
     err = sftp_request(SSH_FXP_LSTAT, &buf, SSH_FXP_ATTRS, &outbuf);
     if (!err) {
         if (buf_get_attrs(&outbuf, stbuf, NULL) == -1)
+#ifdef EPROTO
             err = -EPROTO;
+#else
+             err = -EPROTONOSUPPORT;
+#endif
         buf_free(&outbuf);
     }
     buf_free(&buf);
@@ -1164,7 +1197,11 @@
     if (!err) {
         uint32_t count;
         char *link;
+#ifdef EPROTO
         err = -EPROTO;
+#else
+        err = -EPROTONOSUPPORT;
+#endif
         if(buf_get_uint32(&name, &count) != -1 && count == 1 &&
            buf_get_string(&name, &link) != -1) {
             strncpy(linkbuf, link, size-1);
@@ -1195,7 +1232,11 @@
             err = sftp_request(SSH_FXP_READDIR, &handle, SSH_FXP_NAME, &name);
             if (!err) {
                 if (buf_get_entries(&name, h, filler) == -1)
+#ifdef EPROTO
                     err = -EPROTO;
+#else
+                    err = -EPROTONOSUPPORT;
+#endif
                 buf_free(&name);
             }
         } while (!err);
@@ -1528,7 +1569,11 @@
     err = sftp_request(SSH_FXP_READ, &buf, SSH_FXP_DATA, &data);
     if (!err) {
         uint32_t retsize;
+#ifdef EPROTO
         err = -EPROTO;
+#else
+        err = -EPROTONOSUPPORT;
+#endif
         if (buf_get_uint32(&data, &retsize) != -1) {
             if (retsize > size)
                 fprintf(stderr, "long read\n");
@@ -1550,7 +1595,11 @@
     if (req->error)
         chunk->res = req->error;
     else if (req->replied) {
+#ifdef EPROTO
         chunk->res = -EPROTO;
+#else
+        chunk->res = -EPROTONOSUPPORT;
+#endif
 
         if (req->reply_type == SSH_FXP_STATUS) {
             uint32_t serr;
@@ -1771,7 +1820,7 @@
 {
     (void) path;
 
-    buf->f_namelen = 255;
+    buf->f_namemax = 255;
     buf->f_bsize = 512;
     buf->f_blocks = 999999999 * 2;
     buf->f_bfree =  999999999 * 2;