Rev 3536 | Go to most recent revision | Only display areas with differences | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3536 | Rev 4377 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright (c) 2008 Jakub Jermar |
2 | * Copyright (c) 2008 Jakub Jermar |
3 | * All rights reserved. |
3 | * All rights reserved. |
4 | * |
4 | * |
5 | * Redistribution and use in source and binary forms, with or without |
5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions |
6 | * modification, are permitted provided that the following conditions |
7 | * are met: |
7 | * are met: |
8 | * |
8 | * |
9 | * - Redistributions of source code must retain the above copyright |
9 | * - Redistributions of source code must retain the above copyright |
10 | * notice, this list of conditions and the following disclaimer. |
10 | * notice, this list of conditions and the following disclaimer. |
11 | * - Redistributions in binary form must reproduce the above copyright |
11 | * - Redistributions in binary form must reproduce the above copyright |
12 | * notice, this list of conditions and the following disclaimer in the |
12 | * notice, this list of conditions and the following disclaimer in the |
13 | * documentation and/or other materials provided with the distribution. |
13 | * documentation and/or other materials provided with the distribution. |
14 | * - The name of the author may not be used to endorse or promote products |
14 | * - The name of the author may not be used to endorse or promote products |
15 | * derived from this software without specific prior written permission. |
15 | * derived from this software without specific prior written permission. |
16 | * |
16 | * |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ |
27 | */ |
28 | 28 | ||
29 | /** @addtogroup libc |
29 | /** @addtogroup libc |
30 | * @{ |
30 | * @{ |
31 | */ |
31 | */ |
32 | /** @file |
32 | /** @file |
33 | */ |
33 | */ |
34 | 34 | ||
35 | #include <vfs/vfs.h> |
35 | #include <vfs/vfs.h> |
36 | #include <vfs/canonify.h> |
36 | #include <vfs/canonify.h> |
37 | #include <stdlib.h> |
37 | #include <stdlib.h> |
38 | #include <unistd.h> |
38 | #include <unistd.h> |
39 | #include <dirent.h> |
39 | #include <dirent.h> |
40 | #include <fcntl.h> |
40 | #include <fcntl.h> |
41 | #include <sys/stat.h> |
41 | #include <sys/stat.h> |
42 | #include <stdio.h> |
42 | #include <stdio.h> |
43 | #include <sys/types.h> |
43 | #include <sys/types.h> |
44 | #include <ipc/ipc.h> |
44 | #include <ipc/ipc.h> |
45 | #include <ipc/services.h> |
45 | #include <ipc/services.h> |
46 | #include <async.h> |
46 | #include <async.h> |
47 | #include <atomic.h> |
47 | #include <atomic.h> |
48 | #include <futex.h> |
48 | #include <futex.h> |
49 | #include <errno.h> |
49 | #include <errno.h> |
50 | #include <string.h> |
50 | #include <string.h> |
51 | #include <ipc/devmap.h> |
51 | #include <ipc/devmap.h> |
52 | #include "../../srv/vfs/vfs.h" |
52 | #include "../../../srv/vfs/vfs.h" |
53 | 53 | ||
54 | int vfs_phone = -1; |
54 | int vfs_phone = -1; |
55 | futex_t vfs_phone_futex = FUTEX_INITIALIZER; |
55 | futex_t vfs_phone_futex = FUTEX_INITIALIZER; |
56 | 56 | ||
57 | futex_t cwd_futex = FUTEX_INITIALIZER; |
57 | futex_t cwd_futex = FUTEX_INITIALIZER; |
58 | DIR *cwd_dir = NULL; |
58 | DIR *cwd_dir = NULL; |
59 | char *cwd_path = NULL; |
59 | char *cwd_path = NULL; |
60 | size_t cwd_len = 0; |
60 | size_t cwd_size = 0; |
61 | 61 | ||
62 | char *absolutize(const char *path, size_t *retlen) |
62 | char *absolutize(const char *path, size_t *retlen) |
63 | { |
63 | { |
64 | char *ncwd_path; |
64 | char *ncwd_path; |
65 | char *ncwd_path_nc; |
65 | char *ncwd_path_nc; |
66 | 66 | ||
67 | futex_down(&cwd_futex); |
67 | futex_down(&cwd_futex); |
68 | size_t len = strlen(path); |
68 | size_t size = str_size(path); |
69 | if (*path != '/') { |
69 | if (*path != '/') { |
70 | if (!cwd_path) { |
70 | if (!cwd_path) { |
71 | futex_up(&cwd_futex); |
71 | futex_up(&cwd_futex); |
72 | return NULL; |
72 | return NULL; |
73 | } |
73 | } |
74 | ncwd_path_nc = malloc(cwd_len + 1 + len + 1); |
74 | ncwd_path_nc = malloc(cwd_size + 1 + size + 1); |
75 | if (!ncwd_path_nc) { |
75 | if (!ncwd_path_nc) { |
76 | futex_up(&cwd_futex); |
76 | futex_up(&cwd_futex); |
77 | return NULL; |
77 | return NULL; |
78 | } |
78 | } |
79 | strcpy(ncwd_path_nc, cwd_path); |
79 | str_cpy(ncwd_path_nc, cwd_size + 1 + size + 1, cwd_path); |
80 | ncwd_path_nc[cwd_len] = '/'; |
80 | ncwd_path_nc[cwd_size] = '/'; |
81 | ncwd_path_nc[cwd_len + 1] = '\0'; |
81 | ncwd_path_nc[cwd_size + 1] = '\0'; |
82 | } else { |
82 | } else { |
83 | ncwd_path_nc = malloc(len + 1); |
83 | ncwd_path_nc = malloc(size + 1); |
84 | if (!ncwd_path_nc) { |
84 | if (!ncwd_path_nc) { |
85 | futex_up(&cwd_futex); |
85 | futex_up(&cwd_futex); |
86 | return NULL; |
86 | return NULL; |
87 | } |
87 | } |
88 | ncwd_path_nc[0] = '\0'; |
88 | ncwd_path_nc[0] = '\0'; |
89 | } |
89 | } |
90 | strcat(ncwd_path_nc, path); |
90 | str_append(ncwd_path_nc, cwd_size + 1 + size + 1, path); |
91 | ncwd_path = canonify(ncwd_path_nc, retlen); |
91 | ncwd_path = canonify(ncwd_path_nc, retlen); |
92 | if (!ncwd_path) { |
92 | if (!ncwd_path) { |
93 | futex_up(&cwd_futex); |
93 | futex_up(&cwd_futex); |
94 | free(ncwd_path_nc); |
94 | free(ncwd_path_nc); |
95 | return NULL; |
95 | return NULL; |
96 | } |
96 | } |
97 | /* |
97 | /* |
98 | * We need to clone ncwd_path because canonify() works in-place and thus |
98 | * We need to clone ncwd_path because canonify() works in-place and thus |
99 | * the address in ncwd_path need not be the same as ncwd_path_nc, even |
99 | * the address in ncwd_path need not be the same as ncwd_path_nc, even |
100 | * though they both point into the same dynamically allocated buffer. |
100 | * though they both point into the same dynamically allocated buffer. |
101 | */ |
101 | */ |
102 | ncwd_path = strdup(ncwd_path); |
102 | ncwd_path = str_dup(ncwd_path); |
103 | free(ncwd_path_nc); |
103 | free(ncwd_path_nc); |
104 | if (!ncwd_path) { |
104 | if (!ncwd_path) { |
105 | futex_up(&cwd_futex); |
105 | futex_up(&cwd_futex); |
106 | return NULL; |
106 | return NULL; |
107 | } |
107 | } |
108 | futex_up(&cwd_futex); |
108 | futex_up(&cwd_futex); |
109 | return ncwd_path; |
109 | return ncwd_path; |
110 | } |
110 | } |
111 | 111 | ||
112 | static int vfs_connect(void) |
112 | static void vfs_connect(void) |
113 | { |
113 | { |
114 | if (vfs_phone < 0) |
114 | while (vfs_phone < 0) |
115 | vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0); |
115 | vfs_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VFS, 0, 0); |
116 | return vfs_phone; |
- | |
117 | } |
116 | } |
118 | 117 | ||
119 | static int device_get_handle(const char *name, dev_handle_t *handle) |
118 | static int device_get_handle(const char *name, dev_handle_t *handle, |
- | 119 | const unsigned int flags) |
|
120 | { |
120 | { |
- | 121 | int phone; |
|
- | 122 | ||
- | 123 | if (flags & IPC_FLAG_BLOCKING) |
|
121 | int phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT, |
124 | phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT, 0); |
122 | 0); |
125 | else |
- | 126 | phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT, 0); |
|
- | 127 | ||
123 | if (phone < 0) |
128 | if (phone < 0) |
124 | return phone; |
129 | return phone; |
125 | 130 | ||
126 | ipc_call_t answer; |
131 | ipc_call_t answer; |
127 | aid_t req = async_send_2(phone, DEVMAP_DEVICE_GET_HANDLE, 0, 0, |
132 | aid_t req = async_send_2(phone, DEVMAP_DEVICE_GET_HANDLE, flags, 0, |
128 | &answer); |
133 | &answer); |
129 | 134 | ||
130 | ipcarg_t retval = ipc_data_write_start(phone, name, strlen(name) + 1); |
135 | ipcarg_t retval = ipc_data_write_start(phone, name, str_size(name) + 1); |
131 | 136 | ||
132 | if (retval != EOK) { |
137 | if (retval != EOK) { |
133 | async_wait_for(req, NULL); |
138 | async_wait_for(req, NULL); |
134 | ipc_hangup(phone); |
139 | ipc_hangup(phone); |
135 | return retval; |
140 | return retval; |
136 | } |
141 | } |
137 | 142 | ||
138 | async_wait_for(req, &retval); |
143 | async_wait_for(req, &retval); |
139 | 144 | ||
140 | if (handle != NULL) |
145 | if (handle != NULL) |
141 | *handle = -1; |
146 | *handle = -1; |
142 | 147 | ||
143 | if (retval == EOK) { |
148 | if (retval == EOK) { |
144 | if (handle != NULL) |
149 | if (handle != NULL) |
145 | *handle = (dev_handle_t) IPC_GET_ARG1(answer); |
150 | *handle = (dev_handle_t) IPC_GET_ARG1(answer); |
146 | } |
151 | } |
147 | 152 | ||
148 | ipc_hangup(phone); |
153 | ipc_hangup(phone); |
149 | return retval; |
154 | return retval; |
150 | } |
155 | } |
151 | 156 | ||
152 | int mount(const char *fs_name, const char *mp, const char *dev) |
157 | int mount(const char *fs_name, const char *mp, const char *dev, |
- | 158 | const char *opts, const unsigned int flags) |
|
153 | { |
159 | { |
154 | int res; |
160 | int res; |
155 | ipcarg_t rc; |
161 | ipcarg_t rc; |
156 | aid_t req; |
162 | aid_t req; |
157 | dev_handle_t dev_handle; |
163 | dev_handle_t dev_handle; |
158 | 164 | ||
159 | res = device_get_handle(dev, &dev_handle); |
165 | res = device_get_handle(dev, &dev_handle, flags); |
160 | if (res != EOK) |
166 | if (res != EOK) |
161 | return res; |
167 | return res; |
162 | 168 | ||
163 | size_t mpa_len; |
169 | size_t mpa_size; |
164 | char *mpa = absolutize(mp, &mpa_len); |
170 | char *mpa = absolutize(mp, &mpa_size); |
165 | if (!mpa) |
171 | if (!mpa) |
166 | return ENOMEM; |
172 | return ENOMEM; |
167 | 173 | ||
168 | futex_down(&vfs_phone_futex); |
174 | futex_down(&vfs_phone_futex); |
169 | async_serialize_start(); |
175 | async_serialize_start(); |
170 | if (vfs_phone < 0) { |
176 | vfs_connect(); |
- | 177 | ||
- | 178 | req = async_send_2(vfs_phone, VFS_MOUNT, dev_handle, flags, NULL); |
|
171 | res = vfs_connect(); |
179 | rc = ipc_data_write_start(vfs_phone, (void *) mpa, mpa_size); |
172 | if (res < 0) { |
180 | if (rc != EOK) { |
- | 181 | async_wait_for(req, NULL); |
|
173 | async_serialize_end(); |
182 | async_serialize_end(); |
174 | futex_up(&vfs_phone_futex); |
183 | futex_up(&vfs_phone_futex); |
175 | free(mpa); |
184 | free(mpa); |
176 | return res; |
185 | return (int) rc; |
177 | } |
- | |
178 | } |
186 | } |
179 | req = async_send_1(vfs_phone, VFS_MOUNT, dev_handle, NULL); |
- | |
- | 187 | ||
180 | rc = ipc_data_write_start(vfs_phone, (void *)fs_name, strlen(fs_name)); |
188 | rc = ipc_data_write_start(vfs_phone, (void *) opts, str_size(opts)); |
181 | if (rc != EOK) { |
189 | if (rc != EOK) { |
182 | async_wait_for(req, NULL); |
190 | async_wait_for(req, NULL); |
183 | async_serialize_end(); |
191 | async_serialize_end(); |
184 | futex_up(&vfs_phone_futex); |
192 | futex_up(&vfs_phone_futex); |
185 | free(mpa); |
193 | free(mpa); |
186 | return (int) rc; |
194 | return (int) rc; |
187 | } |
195 | } |
188 | /* Ask VFS whether it likes fs_name. */ |
- | |
- | 196 | ||
189 | rc = async_req_0_0(vfs_phone, IPC_M_PING); |
197 | rc = ipc_data_write_start(vfs_phone, (void *) fs_name, str_size(fs_name)); |
190 | if (rc != EOK) { |
198 | if (rc != EOK) { |
191 | async_wait_for(req, NULL); |
199 | async_wait_for(req, NULL); |
192 | async_serialize_end(); |
200 | async_serialize_end(); |
193 | futex_up(&vfs_phone_futex); |
201 | futex_up(&vfs_phone_futex); |
194 | free(mpa); |
202 | free(mpa); |
195 | return (int) rc; |
203 | return (int) rc; |
196 | } |
204 | } |
- | 205 | ||
- | 206 | /* Ask VFS whether it likes fs_name. */ |
|
197 | rc = ipc_data_write_start(vfs_phone, (void *)mpa, mpa_len); |
207 | rc = async_req_0_0(vfs_phone, IPC_M_PING); |
198 | if (rc != EOK) { |
208 | if (rc != EOK) { |
199 | async_wait_for(req, NULL); |
209 | async_wait_for(req, NULL); |
200 | async_serialize_end(); |
210 | async_serialize_end(); |
201 | futex_up(&vfs_phone_futex); |
211 | futex_up(&vfs_phone_futex); |
202 | free(mpa); |
212 | free(mpa); |
203 | return (int) rc; |
213 | return (int) rc; |
204 | } |
214 | } |
- | 215 | ||
205 | async_wait_for(req, &rc); |
216 | async_wait_for(req, &rc); |
206 | async_serialize_end(); |
217 | async_serialize_end(); |
207 | futex_up(&vfs_phone_futex); |
218 | futex_up(&vfs_phone_futex); |
208 | free(mpa); |
219 | free(mpa); |
- | 220 | ||
209 | return (int) rc; |
221 | return (int) rc; |
210 | } |
222 | } |
211 | 223 | ||
212 | static int _open(const char *path, int lflag, int oflag, ...) |
224 | static int _open(const char *path, int lflag, int oflag, ...) |
213 | { |
225 | { |
214 | int res; |
- | |
215 | ipcarg_t rc; |
226 | ipcarg_t rc; |
216 | ipc_call_t answer; |
227 | ipc_call_t answer; |
217 | aid_t req; |
228 | aid_t req; |
218 | 229 | ||
219 | size_t pa_len; |
230 | size_t pa_size; |
220 | char *pa = absolutize(path, &pa_len); |
231 | char *pa = absolutize(path, &pa_size); |
221 | if (!pa) |
232 | if (!pa) |
222 | return ENOMEM; |
233 | return ENOMEM; |
223 | 234 | ||
224 | futex_down(&vfs_phone_futex); |
235 | futex_down(&vfs_phone_futex); |
225 | async_serialize_start(); |
236 | async_serialize_start(); |
226 | if (vfs_phone < 0) { |
- | |
227 | res = vfs_connect(); |
237 | vfs_connect(); |
228 | if (res < 0) { |
- | |
229 | async_serialize_end(); |
- | |
230 | futex_up(&vfs_phone_futex); |
- | |
231 | free(pa); |
- | |
232 | return res; |
- | |
233 | } |
- | |
234 | } |
238 | |
235 | req = async_send_3(vfs_phone, VFS_OPEN, lflag, oflag, 0, &answer); |
239 | req = async_send_3(vfs_phone, VFS_OPEN, lflag, oflag, 0, &answer); |
236 | rc = ipc_data_write_start(vfs_phone, pa, pa_len); |
240 | rc = ipc_data_write_start(vfs_phone, pa, pa_size); |
237 | if (rc != EOK) { |
241 | if (rc != EOK) { |
238 | async_wait_for(req, NULL); |
242 | async_wait_for(req, NULL); |
239 | async_serialize_end(); |
243 | async_serialize_end(); |
240 | futex_up(&vfs_phone_futex); |
244 | futex_up(&vfs_phone_futex); |
241 | free(pa); |
245 | free(pa); |
242 | return (int) rc; |
246 | return (int) rc; |
243 | } |
247 | } |
244 | async_wait_for(req, &rc); |
248 | async_wait_for(req, &rc); |
245 | async_serialize_end(); |
249 | async_serialize_end(); |
246 | futex_up(&vfs_phone_futex); |
250 | futex_up(&vfs_phone_futex); |
247 | free(pa); |
251 | free(pa); |
248 | 252 | ||
249 | if (rc != EOK) |
253 | if (rc != EOK) |
250 | return (int) rc; |
254 | return (int) rc; |
251 | return (int) IPC_GET_ARG1(answer); |
255 | return (int) IPC_GET_ARG1(answer); |
252 | } |
256 | } |
253 | 257 | ||
254 | int open(const char *path, int oflag, ...) |
258 | int open(const char *path, int oflag, ...) |
255 | { |
259 | { |
256 | return _open(path, L_FILE, oflag); |
260 | return _open(path, L_FILE, oflag); |
257 | } |
261 | } |
258 | 262 | ||
259 | int close(int fildes) |
263 | int close(int fildes) |
260 | { |
264 | { |
261 | int res; |
- | |
262 | ipcarg_t rc; |
265 | ipcarg_t rc; |
263 | 266 | ||
264 | futex_down(&vfs_phone_futex); |
267 | futex_down(&vfs_phone_futex); |
265 | async_serialize_start(); |
268 | async_serialize_start(); |
266 | if (vfs_phone < 0) { |
- | |
267 | res = vfs_connect(); |
269 | vfs_connect(); |
268 | if (res < 0) { |
- | |
269 | async_serialize_end(); |
- | |
270 | futex_up(&vfs_phone_futex); |
- | |
271 | return res; |
- | |
272 | } |
- | |
273 | } |
- | |
274 | 270 | ||
275 | rc = async_req_1_0(vfs_phone, VFS_CLOSE, fildes); |
271 | rc = async_req_1_0(vfs_phone, VFS_CLOSE, fildes); |
276 | 272 | ||
277 | async_serialize_end(); |
273 | async_serialize_end(); |
278 | futex_up(&vfs_phone_futex); |
274 | futex_up(&vfs_phone_futex); |
279 | 275 | ||
280 | return (int)rc; |
276 | return (int)rc; |
281 | } |
277 | } |
282 | 278 | ||
283 | ssize_t read(int fildes, void *buf, size_t nbyte) |
279 | ssize_t read(int fildes, void *buf, size_t nbyte) |
284 | { |
280 | { |
285 | int res; |
- | |
286 | ipcarg_t rc; |
281 | ipcarg_t rc; |
287 | ipc_call_t answer; |
282 | ipc_call_t answer; |
288 | aid_t req; |
283 | aid_t req; |
289 | 284 | ||
290 | futex_down(&vfs_phone_futex); |
285 | futex_down(&vfs_phone_futex); |
291 | async_serialize_start(); |
286 | async_serialize_start(); |
292 | if (vfs_phone < 0) { |
- | |
293 | res = vfs_connect(); |
287 | vfs_connect(); |
294 | if (res < 0) { |
- | |
295 | async_serialize_end(); |
- | |
296 | futex_up(&vfs_phone_futex); |
- | |
297 | return res; |
- | |
298 | } |
- | |
299 | } |
288 | |
300 | req = async_send_1(vfs_phone, VFS_READ, fildes, &answer); |
289 | req = async_send_1(vfs_phone, VFS_READ, fildes, &answer); |
301 | rc = ipc_data_read_start(vfs_phone, (void *)buf, nbyte); |
290 | rc = ipc_data_read_start(vfs_phone, (void *)buf, nbyte); |
302 | if (rc != EOK) { |
291 | if (rc != EOK) { |
303 | async_wait_for(req, NULL); |
292 | async_wait_for(req, NULL); |
304 | async_serialize_end(); |
293 | async_serialize_end(); |
305 | futex_up(&vfs_phone_futex); |
294 | futex_up(&vfs_phone_futex); |
306 | return (ssize_t) rc; |
295 | return (ssize_t) rc; |
307 | } |
296 | } |
308 | async_wait_for(req, &rc); |
297 | async_wait_for(req, &rc); |
309 | async_serialize_end(); |
298 | async_serialize_end(); |
310 | futex_up(&vfs_phone_futex); |
299 | futex_up(&vfs_phone_futex); |
311 | if (rc == EOK) |
300 | if (rc == EOK) |
312 | return (ssize_t) IPC_GET_ARG1(answer); |
301 | return (ssize_t) IPC_GET_ARG1(answer); |
313 | else |
302 | else |
314 | return rc; |
303 | return rc; |
315 | } |
304 | } |
316 | 305 | ||
317 | ssize_t write(int fildes, const void *buf, size_t nbyte) |
306 | ssize_t write(int fildes, const void *buf, size_t nbyte) |
318 | { |
307 | { |
319 | int res; |
- | |
320 | ipcarg_t rc; |
308 | ipcarg_t rc; |
321 | ipc_call_t answer; |
309 | ipc_call_t answer; |
322 | aid_t req; |
310 | aid_t req; |
323 | 311 | ||
324 | futex_down(&vfs_phone_futex); |
312 | futex_down(&vfs_phone_futex); |
325 | async_serialize_start(); |
313 | async_serialize_start(); |
326 | if (vfs_phone < 0) { |
- | |
327 | res = vfs_connect(); |
314 | vfs_connect(); |
328 | if (res < 0) { |
- | |
329 | async_serialize_end(); |
- | |
330 | futex_up(&vfs_phone_futex); |
- | |
331 | return res; |
- | |
332 | } |
- | |
333 | } |
315 | |
334 | req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer); |
316 | req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer); |
335 | rc = ipc_data_write_start(vfs_phone, (void *)buf, nbyte); |
317 | rc = ipc_data_write_start(vfs_phone, (void *)buf, nbyte); |
336 | if (rc != EOK) { |
318 | if (rc != EOK) { |
337 | async_wait_for(req, NULL); |
319 | async_wait_for(req, NULL); |
338 | async_serialize_end(); |
320 | async_serialize_end(); |
339 | futex_up(&vfs_phone_futex); |
321 | futex_up(&vfs_phone_futex); |
340 | return (ssize_t) rc; |
322 | return (ssize_t) rc; |
341 | } |
323 | } |
342 | async_wait_for(req, &rc); |
324 | async_wait_for(req, &rc); |
343 | async_serialize_end(); |
325 | async_serialize_end(); |
344 | futex_up(&vfs_phone_futex); |
326 | futex_up(&vfs_phone_futex); |
345 | if (rc == EOK) |
327 | if (rc == EOK) |
346 | return (ssize_t) IPC_GET_ARG1(answer); |
328 | return (ssize_t) IPC_GET_ARG1(answer); |
347 | else |
329 | else |
348 | return -1; |
330 | return -1; |
349 | } |
331 | } |
350 | 332 | ||
351 | off_t lseek(int fildes, off_t offset, int whence) |
333 | off_t lseek(int fildes, off_t offset, int whence) |
352 | { |
334 | { |
353 | int res; |
- | |
354 | ipcarg_t rc; |
335 | ipcarg_t rc; |
355 | 336 | ||
356 | futex_down(&vfs_phone_futex); |
337 | futex_down(&vfs_phone_futex); |
357 | async_serialize_start(); |
338 | async_serialize_start(); |
358 | if (vfs_phone < 0) { |
- | |
359 | res = vfs_connect(); |
339 | vfs_connect(); |
360 | if (res < 0) { |
- | |
361 | async_serialize_end(); |
- | |
362 | futex_up(&vfs_phone_futex); |
- | |
363 | return res; |
- | |
364 | } |
- | |
365 | } |
- | |
366 | 340 | ||
367 | ipcarg_t newoffs; |
341 | ipcarg_t newoffs; |
368 | rc = async_req_3_1(vfs_phone, VFS_SEEK, fildes, offset, whence, |
342 | rc = async_req_3_1(vfs_phone, VFS_SEEK, fildes, offset, whence, |
369 | &newoffs); |
343 | &newoffs); |
370 | 344 | ||
371 | async_serialize_end(); |
345 | async_serialize_end(); |
372 | futex_up(&vfs_phone_futex); |
346 | futex_up(&vfs_phone_futex); |
373 | 347 | ||
374 | if (rc != EOK) |
348 | if (rc != EOK) |
375 | return (off_t) -1; |
349 | return (off_t) -1; |
376 | 350 | ||
377 | return (off_t) newoffs; |
351 | return (off_t) newoffs; |
378 | } |
352 | } |
379 | 353 | ||
380 | int ftruncate(int fildes, off_t length) |
354 | int ftruncate(int fildes, off_t length) |
381 | { |
355 | { |
382 | int res; |
- | |
383 | ipcarg_t rc; |
356 | ipcarg_t rc; |
384 | 357 | ||
385 | futex_down(&vfs_phone_futex); |
358 | futex_down(&vfs_phone_futex); |
386 | async_serialize_start(); |
359 | async_serialize_start(); |
387 | if (vfs_phone < 0) { |
- | |
388 | res = vfs_connect(); |
360 | vfs_connect(); |
389 | if (res < 0) { |
- | |
390 | async_serialize_end(); |
- | |
391 | futex_up(&vfs_phone_futex); |
- | |
392 | return res; |
- | |
393 | } |
- | |
394 | } |
361 | |
395 | rc = async_req_2_0(vfs_phone, VFS_TRUNCATE, fildes, length); |
362 | rc = async_req_2_0(vfs_phone, VFS_TRUNCATE, fildes, length); |
396 | async_serialize_end(); |
363 | async_serialize_end(); |
397 | futex_up(&vfs_phone_futex); |
364 | futex_up(&vfs_phone_futex); |
398 | return (int) rc; |
365 | return (int) rc; |
399 | } |
366 | } |
400 | 367 | ||
401 | DIR *opendir(const char *dirname) |
368 | DIR *opendir(const char *dirname) |
402 | { |
369 | { |
403 | DIR *dirp = malloc(sizeof(DIR)); |
370 | DIR *dirp = malloc(sizeof(DIR)); |
404 | if (!dirp) |
371 | if (!dirp) |
405 | return NULL; |
372 | return NULL; |
406 | dirp->fd = _open(dirname, L_DIRECTORY, 0); |
373 | dirp->fd = _open(dirname, L_DIRECTORY, 0); |
407 | if (dirp->fd < 0) { |
374 | if (dirp->fd < 0) { |
408 | free(dirp); |
375 | free(dirp); |
409 | return NULL; |
376 | return NULL; |
410 | } |
377 | } |
411 | return dirp; |
378 | return dirp; |
412 | } |
379 | } |
413 | 380 | ||
414 | struct dirent *readdir(DIR *dirp) |
381 | struct dirent *readdir(DIR *dirp) |
415 | { |
382 | { |
416 | ssize_t len = read(dirp->fd, &dirp->res.d_name[0], NAME_MAX + 1); |
383 | ssize_t len = read(dirp->fd, &dirp->res.d_name[0], NAME_MAX + 1); |
417 | if (len <= 0) |
384 | if (len <= 0) |
418 | return NULL; |
385 | return NULL; |
419 | return &dirp->res; |
386 | return &dirp->res; |
420 | } |
387 | } |
421 | 388 | ||
422 | void rewinddir(DIR *dirp) |
389 | void rewinddir(DIR *dirp) |
423 | { |
390 | { |
424 | (void) lseek(dirp->fd, 0, SEEK_SET); |
391 | (void) lseek(dirp->fd, 0, SEEK_SET); |
425 | } |
392 | } |
426 | 393 | ||
427 | int closedir(DIR *dirp) |
394 | int closedir(DIR *dirp) |
428 | { |
395 | { |
429 | (void) close(dirp->fd); |
396 | (void) close(dirp->fd); |
430 | free(dirp); |
397 | free(dirp); |
431 | return 0; |
398 | return 0; |
432 | } |
399 | } |
433 | 400 | ||
434 | int mkdir(const char *path, mode_t mode) |
401 | int mkdir(const char *path, mode_t mode) |
435 | { |
402 | { |
436 | int res; |
- | |
437 | ipcarg_t rc; |
403 | ipcarg_t rc; |
438 | aid_t req; |
404 | aid_t req; |
439 | 405 | ||
440 | size_t pa_len; |
406 | size_t pa_size; |
441 | char *pa = absolutize(path, &pa_len); |
407 | char *pa = absolutize(path, &pa_size); |
442 | if (!pa) |
408 | if (!pa) |
443 | return ENOMEM; |
409 | return ENOMEM; |
444 | 410 | ||
445 | futex_down(&vfs_phone_futex); |
411 | futex_down(&vfs_phone_futex); |
446 | async_serialize_start(); |
412 | async_serialize_start(); |
447 | if (vfs_phone < 0) { |
- | |
448 | res = vfs_connect(); |
413 | vfs_connect(); |
449 | if (res < 0) { |
- | |
450 | async_serialize_end(); |
- | |
451 | futex_up(&vfs_phone_futex); |
- | |
452 | free(pa); |
- | |
453 | return res; |
- | |
454 | } |
- | |
455 | } |
414 | |
456 | req = async_send_1(vfs_phone, VFS_MKDIR, mode, NULL); |
415 | req = async_send_1(vfs_phone, VFS_MKDIR, mode, NULL); |
457 | rc = ipc_data_write_start(vfs_phone, pa, pa_len); |
416 | rc = ipc_data_write_start(vfs_phone, pa, pa_size); |
458 | if (rc != EOK) { |
417 | if (rc != EOK) { |
459 | async_wait_for(req, NULL); |
418 | async_wait_for(req, NULL); |
460 | async_serialize_end(); |
419 | async_serialize_end(); |
461 | futex_up(&vfs_phone_futex); |
420 | futex_up(&vfs_phone_futex); |
462 | free(pa); |
421 | free(pa); |
463 | return (int) rc; |
422 | return (int) rc; |
464 | } |
423 | } |
465 | async_wait_for(req, &rc); |
424 | async_wait_for(req, &rc); |
466 | async_serialize_end(); |
425 | async_serialize_end(); |
467 | futex_up(&vfs_phone_futex); |
426 | futex_up(&vfs_phone_futex); |
468 | free(pa); |
427 | free(pa); |
469 | return rc; |
428 | return rc; |
470 | } |
429 | } |
471 | 430 | ||
472 | static int _unlink(const char *path, int lflag) |
431 | static int _unlink(const char *path, int lflag) |
473 | { |
432 | { |
474 | int res; |
- | |
475 | ipcarg_t rc; |
433 | ipcarg_t rc; |
476 | aid_t req; |
434 | aid_t req; |
477 | 435 | ||
478 | size_t pa_len; |
436 | size_t pa_size; |
479 | char *pa = absolutize(path, &pa_len); |
437 | char *pa = absolutize(path, &pa_size); |
480 | if (!pa) |
438 | if (!pa) |
481 | return ENOMEM; |
439 | return ENOMEM; |
482 | 440 | ||
483 | futex_down(&vfs_phone_futex); |
441 | futex_down(&vfs_phone_futex); |
484 | async_serialize_start(); |
442 | async_serialize_start(); |
485 | if (vfs_phone < 0) { |
- | |
486 | res = vfs_connect(); |
443 | vfs_connect(); |
487 | if (res < 0) { |
- | |
488 | async_serialize_end(); |
- | |
489 | futex_up(&vfs_phone_futex); |
- | |
490 | free(pa); |
- | |
491 | return res; |
- | |
492 | } |
- | |
493 | } |
444 | |
494 | req = async_send_0(vfs_phone, VFS_UNLINK, NULL); |
445 | req = async_send_0(vfs_phone, VFS_UNLINK, NULL); |
495 | rc = ipc_data_write_start(vfs_phone, pa, pa_len); |
446 | rc = ipc_data_write_start(vfs_phone, pa, pa_size); |
496 | if (rc != EOK) { |
447 | if (rc != EOK) { |
497 | async_wait_for(req, NULL); |
448 | async_wait_for(req, NULL); |
498 | async_serialize_end(); |
449 | async_serialize_end(); |
499 | futex_up(&vfs_phone_futex); |
450 | futex_up(&vfs_phone_futex); |
500 | free(pa); |
451 | free(pa); |
501 | return (int) rc; |
452 | return (int) rc; |
502 | } |
453 | } |
503 | async_wait_for(req, &rc); |
454 | async_wait_for(req, &rc); |
504 | async_serialize_end(); |
455 | async_serialize_end(); |
505 | futex_up(&vfs_phone_futex); |
456 | futex_up(&vfs_phone_futex); |
506 | free(pa); |
457 | free(pa); |
507 | return rc; |
458 | return rc; |
508 | } |
459 | } |
509 | 460 | ||
510 | int unlink(const char *path) |
461 | int unlink(const char *path) |
511 | { |
462 | { |
512 | return _unlink(path, L_NONE); |
463 | return _unlink(path, L_NONE); |
513 | } |
464 | } |
514 | 465 | ||
515 | int rmdir(const char *path) |
466 | int rmdir(const char *path) |
516 | { |
467 | { |
517 | return _unlink(path, L_DIRECTORY); |
468 | return _unlink(path, L_DIRECTORY); |
518 | } |
469 | } |
519 | 470 | ||
520 | int rename(const char *old, const char *new) |
471 | int rename(const char *old, const char *new) |
521 | { |
472 | { |
522 | int res; |
- | |
523 | ipcarg_t rc; |
473 | ipcarg_t rc; |
524 | aid_t req; |
474 | aid_t req; |
525 | 475 | ||
526 | size_t olda_len; |
476 | size_t olda_size; |
527 | char *olda = absolutize(old, &olda_len); |
477 | char *olda = absolutize(old, &olda_size); |
528 | if (!olda) |
478 | if (!olda) |
529 | return ENOMEM; |
479 | return ENOMEM; |
530 | 480 | ||
531 | size_t newa_len; |
481 | size_t newa_size; |
532 | char *newa = absolutize(new, &newa_len); |
482 | char *newa = absolutize(new, &newa_size); |
533 | if (!newa) { |
483 | if (!newa) { |
534 | free(olda); |
484 | free(olda); |
535 | return ENOMEM; |
485 | return ENOMEM; |
536 | } |
486 | } |
537 | 487 | ||
538 | futex_down(&vfs_phone_futex); |
488 | futex_down(&vfs_phone_futex); |
539 | async_serialize_start(); |
489 | async_serialize_start(); |
540 | if (vfs_phone < 0) { |
- | |
541 | res = vfs_connect(); |
490 | vfs_connect(); |
542 | if (res < 0) { |
- | |
543 | async_serialize_end(); |
- | |
544 | futex_up(&vfs_phone_futex); |
- | |
545 | free(olda); |
- | |
546 | free(newa); |
- | |
547 | return res; |
- | |
548 | } |
- | |
549 | } |
491 | |
550 | req = async_send_0(vfs_phone, VFS_RENAME, NULL); |
492 | req = async_send_0(vfs_phone, VFS_RENAME, NULL); |
551 | rc = ipc_data_write_start(vfs_phone, olda, olda_len); |
493 | rc = ipc_data_write_start(vfs_phone, olda, olda_size); |
552 | if (rc != EOK) { |
494 | if (rc != EOK) { |
553 | async_wait_for(req, NULL); |
495 | async_wait_for(req, NULL); |
554 | async_serialize_end(); |
496 | async_serialize_end(); |
555 | futex_up(&vfs_phone_futex); |
497 | futex_up(&vfs_phone_futex); |
556 | free(olda); |
498 | free(olda); |
557 | free(newa); |
499 | free(newa); |
558 | return (int) rc; |
500 | return (int) rc; |
559 | } |
501 | } |
560 | rc = ipc_data_write_start(vfs_phone, newa, newa_len); |
502 | rc = ipc_data_write_start(vfs_phone, newa, newa_size); |
561 | if (rc != EOK) { |
503 | if (rc != EOK) { |
562 | async_wait_for(req, NULL); |
504 | async_wait_for(req, NULL); |
563 | async_serialize_end(); |
505 | async_serialize_end(); |
564 | futex_up(&vfs_phone_futex); |
506 | futex_up(&vfs_phone_futex); |
565 | free(olda); |
507 | free(olda); |
566 | free(newa); |
508 | free(newa); |
567 | return (int) rc; |
509 | return (int) rc; |
568 | } |
510 | } |
569 | async_wait_for(req, &rc); |
511 | async_wait_for(req, &rc); |
570 | async_serialize_end(); |
512 | async_serialize_end(); |
571 | futex_up(&vfs_phone_futex); |
513 | futex_up(&vfs_phone_futex); |
572 | free(olda); |
514 | free(olda); |
573 | free(newa); |
515 | free(newa); |
574 | return rc; |
516 | return rc; |
575 | } |
517 | } |
576 | 518 | ||
577 | int chdir(const char *path) |
519 | int chdir(const char *path) |
578 | { |
520 | { |
579 | size_t pa_len; |
521 | size_t pa_size; |
580 | char *pa = absolutize(path, &pa_len); |
522 | char *pa = absolutize(path, &pa_size); |
581 | if (!pa) |
523 | if (!pa) |
582 | return ENOMEM; |
524 | return ENOMEM; |
583 | 525 | ||
584 | DIR *d = opendir(pa); |
526 | DIR *d = opendir(pa); |
585 | if (!d) { |
527 | if (!d) { |
586 | free(pa); |
528 | free(pa); |
587 | return ENOENT; |
529 | return ENOENT; |
588 | } |
530 | } |
589 | 531 | ||
590 | futex_down(&cwd_futex); |
532 | futex_down(&cwd_futex); |
591 | if (cwd_dir) { |
533 | if (cwd_dir) { |
592 | closedir(cwd_dir); |
534 | closedir(cwd_dir); |
593 | cwd_dir = NULL; |
535 | cwd_dir = NULL; |
594 | free(cwd_path); |
536 | free(cwd_path); |
595 | cwd_path = NULL; |
537 | cwd_path = NULL; |
596 | cwd_len = 0; |
538 | cwd_size = 0; |
597 | } |
539 | } |
598 | cwd_dir = d; |
540 | cwd_dir = d; |
599 | cwd_path = pa; |
541 | cwd_path = pa; |
600 | cwd_len = pa_len; |
542 | cwd_size = pa_size; |
601 | futex_up(&cwd_futex); |
543 | futex_up(&cwd_futex); |
602 | return EOK; |
544 | return EOK; |
603 | } |
545 | } |
604 | 546 | ||
605 | char *getcwd(char *buf, size_t size) |
547 | char *getcwd(char *buf, size_t size) |
606 | { |
548 | { |
607 | if (!size) |
549 | if (!size) |
608 | return NULL; |
550 | return NULL; |
609 | futex_down(&cwd_futex); |
551 | futex_down(&cwd_futex); |
610 | if (size < cwd_len + 1) { |
552 | if (size < cwd_size + 1) { |
611 | futex_up(&cwd_futex); |
553 | futex_up(&cwd_futex); |
612 | return NULL; |
554 | return NULL; |
613 | } |
555 | } |
614 | strcpy(buf, cwd_path); |
556 | str_cpy(buf, size, cwd_path); |
615 | futex_up(&cwd_futex); |
557 | futex_up(&cwd_futex); |
616 | return buf; |
558 | return buf; |
617 | } |
559 | } |
618 | 560 | ||
619 | /** @} |
561 | /** @} |
620 | */ |
562 | */ |
621 | 563 |