Rev 2763 | Rev 3077 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2763 | Rev 2771 | ||
---|---|---|---|
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 <sys/types.h> |
43 | #include <sys/types.h> |
43 | #include <ipc/ipc.h> |
44 | #include <ipc/ipc.h> |
44 | #include <ipc/services.h> |
45 | #include <ipc/services.h> |
45 | #include <async.h> |
46 | #include <async.h> |
46 | #include <atomic.h> |
47 | #include <atomic.h> |
47 | #include <futex.h> |
48 | #include <futex.h> |
48 | #include <errno.h> |
49 | #include <errno.h> |
49 | #include <string.h> |
50 | #include <string.h> |
50 | #include "../../srv/vfs/vfs.h" |
51 | #include "../../srv/vfs/vfs.h" |
51 | 52 | ||
52 | int vfs_phone = -1; |
53 | int vfs_phone = -1; |
53 | futex_t vfs_phone_futex = FUTEX_INITIALIZER; |
54 | futex_t vfs_phone_futex = FUTEX_INITIALIZER; |
54 | 55 | ||
55 | futex_t cwd_futex = FUTEX_INITIALIZER; |
56 | futex_t cwd_futex = FUTEX_INITIALIZER; |
56 | DIR *cwd_dir = NULL; |
57 | DIR *cwd_dir = NULL; |
57 | char *cwd_path = NULL; |
58 | char *cwd_path = NULL; |
58 | size_t cwd_len = 0; |
59 | size_t cwd_len = 0; |
59 | 60 | ||
60 | static char *absolutize(const char *path) |
61 | static char *absolutize(const char *path, size_t *retlen) |
61 | { |
62 | { |
62 | char *ncwd_path; |
63 | char *ncwd_path; |
63 | 64 | ||
64 | futex_down(&cwd_futex); |
65 | futex_down(&cwd_futex); |
65 | size_t len = strlen(path); |
66 | size_t len = strlen(path); |
66 | if (*path != '/') { |
67 | if (*path != '/') { |
67 | if (!cwd_path) { |
68 | if (!cwd_path) { |
68 | futex_up(&cwd_futex); |
69 | futex_up(&cwd_futex); |
69 | return NULL; |
70 | return NULL; |
70 | } |
71 | } |
71 | ncwd_path = malloc(len + cwd_len + 1); |
72 | ncwd_path = malloc(len + cwd_len + 1); |
72 | if (!ncwd_path) { |
73 | if (!ncwd_path) { |
73 | futex_up(&cwd_futex); |
74 | futex_up(&cwd_futex); |
74 | return NULL; |
75 | return NULL; |
75 | } |
76 | } |
76 | strcpy(ncwd_path, cwd_path); |
77 | strcpy(ncwd_path, cwd_path); |
77 | ncwd_path[cwd_len] = '/'; |
78 | ncwd_path[cwd_len] = '/'; |
78 | ncwd_path[cwd_len + 1] = '\0'; |
79 | ncwd_path[cwd_len + 1] = '\0'; |
79 | } else { |
80 | } else { |
80 | ncwd_path = malloc(len + 1); |
81 | ncwd_path = malloc(len + 1); |
81 | if (!ncwd_path) { |
82 | if (!ncwd_path) { |
82 | futex_up(&cwd_futex); |
83 | futex_up(&cwd_futex); |
83 | return NULL; |
84 | return NULL; |
84 | } |
85 | } |
85 | ncwd_path[0] = '\0'; |
86 | ncwd_path[0] = '\0'; |
86 | } |
87 | } |
87 | strcat(ncwd_path, path); |
88 | strcat(ncwd_path, path); |
- | 89 | if (!canonify(ncwd_path, retlen)) { |
|
- | 90 | futex_up(&cwd_futex); |
|
- | 91 | free(ncwd_path); |
|
- | 92 | return NULL; |
|
- | 93 | } |
|
88 | futex_up(&cwd_futex); |
94 | futex_up(&cwd_futex); |
89 | return ncwd_path; |
95 | return ncwd_path; |
90 | } |
96 | } |
91 | 97 | ||
92 | static int vfs_connect(void) |
98 | static int vfs_connect(void) |
93 | { |
99 | { |
94 | if (vfs_phone < 0) |
100 | if (vfs_phone < 0) |
95 | vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0); |
101 | vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0); |
96 | return vfs_phone; |
102 | return vfs_phone; |
97 | } |
103 | } |
98 | 104 | ||
99 | int mount(const char *fs_name, const char *mp, const char *dev) |
105 | int mount(const char *fs_name, const char *mp, const char *dev) |
100 | { |
106 | { |
101 | int res; |
107 | int res; |
102 | ipcarg_t rc; |
108 | ipcarg_t rc; |
103 | aid_t req; |
109 | aid_t req; |
104 | 110 | ||
105 | int dev_handle = 0; /* TODO */ |
111 | dev_handle_t dev_handle = 0; /* TODO */ |
106 | 112 | ||
- | 113 | size_t mpa_len; |
|
107 | char *mpa = absolutize(mp); |
114 | char *mpa = absolutize(mp, &mpa_len); |
108 | if (!mpa) |
115 | if (!mpa) |
109 | return ENOMEM; |
116 | return ENOMEM; |
110 | size_t mpc_len; |
- | |
111 | char *mpc = canonify(mpa, &mpc_len); |
- | |
112 | if (!mpc) { |
- | |
113 | free(mpa); |
- | |
114 | return EINVAL; |
- | |
115 | } |
- | |
116 | 117 | ||
117 | futex_down(&vfs_phone_futex); |
118 | futex_down(&vfs_phone_futex); |
118 | async_serialize_start(); |
119 | async_serialize_start(); |
119 | if (vfs_phone < 0) { |
120 | if (vfs_phone < 0) { |
120 | res = vfs_connect(); |
121 | res = vfs_connect(); |
121 | if (res < 0) { |
122 | if (res < 0) { |
122 | async_serialize_end(); |
123 | async_serialize_end(); |
123 | futex_up(&vfs_phone_futex); |
124 | futex_up(&vfs_phone_futex); |
124 | free(mpa); |
125 | free(mpa); |
125 | return res; |
126 | return res; |
126 | } |
127 | } |
127 | } |
128 | } |
128 | req = async_send_1(vfs_phone, VFS_MOUNT, dev_handle, NULL); |
129 | req = async_send_1(vfs_phone, VFS_MOUNT, dev_handle, NULL); |
129 | rc = ipc_data_write_start(vfs_phone, (void *)fs_name, strlen(fs_name)); |
130 | rc = ipc_data_write_start(vfs_phone, (void *)fs_name, strlen(fs_name)); |
130 | if (rc != EOK) { |
131 | if (rc != EOK) { |
131 | async_wait_for(req, NULL); |
132 | async_wait_for(req, NULL); |
132 | async_serialize_end(); |
133 | async_serialize_end(); |
133 | futex_up(&vfs_phone_futex); |
134 | futex_up(&vfs_phone_futex); |
134 | free(mpa); |
135 | free(mpa); |
135 | return (int) rc; |
136 | return (int) rc; |
136 | } |
137 | } |
137 | rc = ipc_data_write_start(vfs_phone, (void *)mpc, mpc_len); |
138 | rc = ipc_data_write_start(vfs_phone, (void *)mpa, mpa_len); |
138 | if (rc != EOK) { |
139 | if (rc != EOK) { |
139 | async_wait_for(req, NULL); |
140 | async_wait_for(req, NULL); |
140 | async_serialize_end(); |
141 | async_serialize_end(); |
141 | futex_up(&vfs_phone_futex); |
142 | futex_up(&vfs_phone_futex); |
142 | free(mpa); |
143 | free(mpa); |
143 | return (int) rc; |
144 | return (int) rc; |
144 | } |
145 | } |
145 | async_wait_for(req, &rc); |
146 | async_wait_for(req, &rc); |
146 | async_serialize_end(); |
147 | async_serialize_end(); |
147 | futex_up(&vfs_phone_futex); |
148 | futex_up(&vfs_phone_futex); |
148 | free(mpa); |
149 | free(mpa); |
149 | return (int) rc; |
150 | return (int) rc; |
150 | } |
151 | } |
151 | 152 | ||
152 | static int _open(const char *path, int lflag, int oflag, ...) |
153 | static int _open(const char *path, int lflag, int oflag, ...) |
153 | { |
154 | { |
154 | int res; |
155 | int res; |
155 | ipcarg_t rc; |
156 | ipcarg_t rc; |
156 | ipc_call_t answer; |
157 | ipc_call_t answer; |
157 | aid_t req; |
158 | aid_t req; |
158 | 159 | ||
- | 160 | size_t pa_len; |
|
159 | char *pa = absolutize(path); |
161 | char *pa = absolutize(path, &pa_len); |
160 | if (!pa) |
162 | if (!pa) |
161 | return ENOMEM; |
163 | return ENOMEM; |
162 | size_t pc_len; |
- | |
163 | char *pc = canonify(pa, &pc_len); |
- | |
164 | if (!pc) { |
- | |
165 | free(pa); |
- | |
166 | return EINVAL; |
- | |
167 | } |
- | |
168 | 164 | ||
169 | futex_down(&vfs_phone_futex); |
165 | futex_down(&vfs_phone_futex); |
170 | async_serialize_start(); |
166 | async_serialize_start(); |
171 | if (vfs_phone < 0) { |
167 | if (vfs_phone < 0) { |
172 | res = vfs_connect(); |
168 | res = vfs_connect(); |
173 | if (res < 0) { |
169 | if (res < 0) { |
174 | async_serialize_end(); |
170 | async_serialize_end(); |
175 | futex_up(&vfs_phone_futex); |
171 | futex_up(&vfs_phone_futex); |
176 | free(pa); |
172 | free(pa); |
177 | return res; |
173 | return res; |
178 | } |
174 | } |
179 | } |
175 | } |
180 | req = async_send_3(vfs_phone, VFS_OPEN, lflag, oflag, 0, &answer); |
176 | req = async_send_3(vfs_phone, VFS_OPEN, lflag, oflag, 0, &answer); |
181 | rc = ipc_data_write_start(vfs_phone, pc, pc_len); |
177 | rc = ipc_data_write_start(vfs_phone, pa, pa_len); |
182 | if (rc != EOK) { |
178 | if (rc != EOK) { |
183 | async_wait_for(req, NULL); |
179 | async_wait_for(req, NULL); |
184 | async_serialize_end(); |
180 | async_serialize_end(); |
185 | futex_up(&vfs_phone_futex); |
181 | futex_up(&vfs_phone_futex); |
186 | free(pa); |
182 | free(pa); |
187 | return (int) rc; |
183 | return (int) rc; |
188 | } |
184 | } |
189 | async_wait_for(req, &rc); |
185 | async_wait_for(req, &rc); |
190 | async_serialize_end(); |
186 | async_serialize_end(); |
191 | futex_up(&vfs_phone_futex); |
187 | futex_up(&vfs_phone_futex); |
192 | free(pa); |
188 | free(pa); |
193 | return (int) IPC_GET_ARG1(answer); |
189 | return (int) IPC_GET_ARG1(answer); |
194 | } |
190 | } |
195 | 191 | ||
196 | int open(const char *path, int oflag, ...) |
192 | int open(const char *path, int oflag, ...) |
197 | { |
193 | { |
198 | return _open(path, L_FILE, oflag); |
194 | return _open(path, L_FILE, oflag); |
199 | } |
195 | } |
200 | 196 | ||
201 | int close(int fildes) |
197 | int close(int fildes) |
202 | { |
198 | { |
203 | int res; |
199 | int res; |
204 | ipcarg_t rc; |
200 | ipcarg_t rc; |
205 | 201 | ||
206 | futex_down(&vfs_phone_futex); |
202 | futex_down(&vfs_phone_futex); |
207 | async_serialize_start(); |
203 | async_serialize_start(); |
208 | if (vfs_phone < 0) { |
204 | if (vfs_phone < 0) { |
209 | res = vfs_connect(); |
205 | res = vfs_connect(); |
210 | if (res < 0) { |
206 | if (res < 0) { |
211 | async_serialize_end(); |
207 | async_serialize_end(); |
212 | futex_up(&vfs_phone_futex); |
208 | futex_up(&vfs_phone_futex); |
213 | return res; |
209 | return res; |
214 | } |
210 | } |
215 | } |
211 | } |
216 | 212 | ||
217 | rc = async_req_1_0(vfs_phone, VFS_CLOSE, fildes); |
213 | rc = async_req_1_0(vfs_phone, VFS_CLOSE, fildes); |
218 | 214 | ||
219 | async_serialize_end(); |
215 | async_serialize_end(); |
220 | futex_up(&vfs_phone_futex); |
216 | futex_up(&vfs_phone_futex); |
221 | 217 | ||
222 | return (int)rc; |
218 | return (int)rc; |
223 | } |
219 | } |
224 | 220 | ||
225 | ssize_t read(int fildes, void *buf, size_t nbyte) |
221 | ssize_t read(int fildes, void *buf, size_t nbyte) |
226 | { |
222 | { |
227 | int res; |
223 | int res; |
228 | ipcarg_t rc; |
224 | ipcarg_t rc; |
229 | ipc_call_t answer; |
225 | ipc_call_t answer; |
230 | aid_t req; |
226 | aid_t req; |
231 | 227 | ||
232 | futex_down(&vfs_phone_futex); |
228 | futex_down(&vfs_phone_futex); |
233 | async_serialize_start(); |
229 | async_serialize_start(); |
234 | if (vfs_phone < 0) { |
230 | if (vfs_phone < 0) { |
235 | res = vfs_connect(); |
231 | res = vfs_connect(); |
236 | if (res < 0) { |
232 | if (res < 0) { |
237 | async_serialize_end(); |
233 | async_serialize_end(); |
238 | futex_up(&vfs_phone_futex); |
234 | futex_up(&vfs_phone_futex); |
239 | return res; |
235 | return res; |
240 | } |
236 | } |
241 | } |
237 | } |
242 | req = async_send_1(vfs_phone, VFS_READ, fildes, &answer); |
238 | req = async_send_1(vfs_phone, VFS_READ, fildes, &answer); |
243 | rc = ipc_data_read_start(vfs_phone, (void *)buf, nbyte); |
239 | rc = ipc_data_read_start(vfs_phone, (void *)buf, nbyte); |
244 | if (rc != EOK) { |
240 | if (rc != EOK) { |
245 | async_wait_for(req, NULL); |
241 | async_wait_for(req, NULL); |
246 | async_serialize_end(); |
242 | async_serialize_end(); |
247 | futex_up(&vfs_phone_futex); |
243 | futex_up(&vfs_phone_futex); |
248 | return (ssize_t) rc; |
244 | return (ssize_t) rc; |
249 | } |
245 | } |
250 | async_wait_for(req, &rc); |
246 | async_wait_for(req, &rc); |
251 | async_serialize_end(); |
247 | async_serialize_end(); |
252 | futex_up(&vfs_phone_futex); |
248 | futex_up(&vfs_phone_futex); |
253 | if (rc == EOK) |
249 | if (rc == EOK) |
254 | return (ssize_t) IPC_GET_ARG1(answer); |
250 | return (ssize_t) IPC_GET_ARG1(answer); |
255 | else |
251 | else |
256 | return -1; |
252 | return -1; |
257 | } |
253 | } |
258 | 254 | ||
259 | ssize_t write(int fildes, const void *buf, size_t nbyte) |
255 | ssize_t write(int fildes, const void *buf, size_t nbyte) |
260 | { |
256 | { |
261 | int res; |
257 | int res; |
262 | ipcarg_t rc; |
258 | ipcarg_t rc; |
263 | ipc_call_t answer; |
259 | ipc_call_t answer; |
264 | aid_t req; |
260 | aid_t req; |
265 | 261 | ||
266 | futex_down(&vfs_phone_futex); |
262 | futex_down(&vfs_phone_futex); |
267 | async_serialize_start(); |
263 | async_serialize_start(); |
268 | if (vfs_phone < 0) { |
264 | if (vfs_phone < 0) { |
269 | res = vfs_connect(); |
265 | res = vfs_connect(); |
270 | if (res < 0) { |
266 | if (res < 0) { |
271 | async_serialize_end(); |
267 | async_serialize_end(); |
272 | futex_up(&vfs_phone_futex); |
268 | futex_up(&vfs_phone_futex); |
273 | return res; |
269 | return res; |
274 | } |
270 | } |
275 | } |
271 | } |
276 | req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer); |
272 | req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer); |
277 | rc = ipc_data_write_start(vfs_phone, (void *)buf, nbyte); |
273 | rc = ipc_data_write_start(vfs_phone, (void *)buf, nbyte); |
278 | if (rc != EOK) { |
274 | if (rc != EOK) { |
279 | async_wait_for(req, NULL); |
275 | async_wait_for(req, NULL); |
280 | async_serialize_end(); |
276 | async_serialize_end(); |
281 | futex_up(&vfs_phone_futex); |
277 | futex_up(&vfs_phone_futex); |
282 | return (ssize_t) rc; |
278 | return (ssize_t) rc; |
283 | } |
279 | } |
284 | async_wait_for(req, &rc); |
280 | async_wait_for(req, &rc); |
285 | async_serialize_end(); |
281 | async_serialize_end(); |
286 | futex_up(&vfs_phone_futex); |
282 | futex_up(&vfs_phone_futex); |
287 | if (rc == EOK) |
283 | if (rc == EOK) |
288 | return (ssize_t) IPC_GET_ARG1(answer); |
284 | return (ssize_t) IPC_GET_ARG1(answer); |
289 | else |
285 | else |
290 | return -1; |
286 | return -1; |
291 | } |
287 | } |
292 | 288 | ||
293 | off_t lseek(int fildes, off_t offset, int whence) |
289 | off_t lseek(int fildes, off_t offset, int whence) |
294 | { |
290 | { |
295 | int res; |
291 | int res; |
296 | ipcarg_t rc; |
292 | ipcarg_t rc; |
297 | 293 | ||
298 | futex_down(&vfs_phone_futex); |
294 | futex_down(&vfs_phone_futex); |
299 | async_serialize_start(); |
295 | async_serialize_start(); |
300 | if (vfs_phone < 0) { |
296 | if (vfs_phone < 0) { |
301 | res = vfs_connect(); |
297 | res = vfs_connect(); |
302 | if (res < 0) { |
298 | if (res < 0) { |
303 | async_serialize_end(); |
299 | async_serialize_end(); |
304 | futex_up(&vfs_phone_futex); |
300 | futex_up(&vfs_phone_futex); |
305 | return res; |
301 | return res; |
306 | } |
302 | } |
307 | } |
303 | } |
308 | 304 | ||
309 | off_t newoffs; |
305 | off_t newoffs; |
310 | rc = async_req_3_1(vfs_phone, VFS_SEEK, fildes, offset, whence, |
306 | rc = async_req_3_1(vfs_phone, VFS_SEEK, fildes, offset, whence, |
311 | (ipcarg_t)&newoffs); |
307 | (ipcarg_t)&newoffs); |
312 | 308 | ||
313 | async_serialize_end(); |
309 | async_serialize_end(); |
314 | futex_up(&vfs_phone_futex); |
310 | futex_up(&vfs_phone_futex); |
315 | 311 | ||
316 | if (rc != EOK) |
312 | if (rc != EOK) |
317 | return (off_t) -1; |
313 | return (off_t) -1; |
318 | 314 | ||
319 | return newoffs; |
315 | return newoffs; |
320 | } |
316 | } |
321 | 317 | ||
322 | int ftruncate(int fildes, off_t length) |
318 | int ftruncate(int fildes, off_t length) |
323 | { |
319 | { |
324 | int res; |
320 | int res; |
325 | ipcarg_t rc; |
321 | ipcarg_t rc; |
326 | 322 | ||
327 | futex_down(&vfs_phone_futex); |
323 | futex_down(&vfs_phone_futex); |
328 | async_serialize_start(); |
324 | async_serialize_start(); |
329 | if (vfs_phone < 0) { |
325 | if (vfs_phone < 0) { |
330 | res = vfs_connect(); |
326 | res = vfs_connect(); |
331 | if (res < 0) { |
327 | if (res < 0) { |
332 | async_serialize_end(); |
328 | async_serialize_end(); |
333 | futex_up(&vfs_phone_futex); |
329 | futex_up(&vfs_phone_futex); |
334 | return res; |
330 | return res; |
335 | } |
331 | } |
336 | } |
332 | } |
337 | rc = async_req_2_0(vfs_phone, VFS_TRUNCATE, fildes, length); |
333 | rc = async_req_2_0(vfs_phone, VFS_TRUNCATE, fildes, length); |
338 | async_serialize_end(); |
334 | async_serialize_end(); |
339 | futex_up(&vfs_phone_futex); |
335 | futex_up(&vfs_phone_futex); |
340 | return (int) rc; |
336 | return (int) rc; |
341 | } |
337 | } |
342 | 338 | ||
343 | DIR *opendir(const char *dirname) |
339 | DIR *opendir(const char *dirname) |
344 | { |
340 | { |
345 | DIR *dirp = malloc(sizeof(DIR)); |
341 | DIR *dirp = malloc(sizeof(DIR)); |
346 | if (!dirp) |
342 | if (!dirp) |
347 | return NULL; |
343 | return NULL; |
348 | dirp->fd = _open(dirname, L_DIRECTORY, 0); |
344 | dirp->fd = _open(dirname, L_DIRECTORY, 0); |
349 | if (dirp->fd < 0) { |
345 | if (dirp->fd < 0) { |
350 | free(dirp); |
346 | free(dirp); |
351 | return NULL; |
347 | return NULL; |
352 | } |
348 | } |
353 | return dirp; |
349 | return dirp; |
354 | } |
350 | } |
355 | 351 | ||
356 | struct dirent *readdir(DIR *dirp) |
352 | struct dirent *readdir(DIR *dirp) |
357 | { |
353 | { |
358 | ssize_t len = read(dirp->fd, &dirp->res.d_name[0], NAME_MAX + 1); |
354 | ssize_t len = read(dirp->fd, &dirp->res.d_name[0], NAME_MAX + 1); |
359 | if (len <= 0) |
355 | if (len <= 0) |
360 | return NULL; |
356 | return NULL; |
361 | return &dirp->res; |
357 | return &dirp->res; |
362 | } |
358 | } |
363 | 359 | ||
364 | void rewinddir(DIR *dirp) |
360 | void rewinddir(DIR *dirp) |
365 | { |
361 | { |
366 | (void) lseek(dirp->fd, 0, SEEK_SET); |
362 | (void) lseek(dirp->fd, 0, SEEK_SET); |
367 | } |
363 | } |
368 | 364 | ||
369 | int closedir(DIR *dirp) |
365 | int closedir(DIR *dirp) |
370 | { |
366 | { |
371 | (void) close(dirp->fd); |
367 | (void) close(dirp->fd); |
372 | free(dirp); |
368 | free(dirp); |
373 | return 0; |
369 | return 0; |
374 | } |
370 | } |
375 | 371 | ||
376 | int mkdir(const char *path, mode_t mode) |
372 | int mkdir(const char *path, mode_t mode) |
377 | { |
373 | { |
378 | int res; |
374 | int res; |
379 | ipcarg_t rc; |
375 | ipcarg_t rc; |
380 | aid_t req; |
376 | aid_t req; |
381 | 377 | ||
- | 378 | size_t pa_len; |
|
382 | char *pa = absolutize(path); |
379 | char *pa = absolutize(path, &pa_len); |
383 | if (!pa) |
380 | if (!pa) |
384 | return ENOMEM; |
381 | return ENOMEM; |
385 | size_t pc_len; |
- | |
386 | char *pc = canonify(pa, &pc_len); |
- | |
387 | if (!pc) { |
- | |
388 | free(pa); |
- | |
389 | return EINVAL; |
- | |
390 | } |
- | |
391 | 382 | ||
392 | futex_down(&vfs_phone_futex); |
383 | futex_down(&vfs_phone_futex); |
393 | async_serialize_start(); |
384 | async_serialize_start(); |
394 | if (vfs_phone < 0) { |
385 | if (vfs_phone < 0) { |
395 | res = vfs_connect(); |
386 | res = vfs_connect(); |
396 | if (res < 0) { |
387 | if (res < 0) { |
397 | async_serialize_end(); |
388 | async_serialize_end(); |
398 | futex_up(&vfs_phone_futex); |
389 | futex_up(&vfs_phone_futex); |
399 | free(pa); |
390 | free(pa); |
400 | return res; |
391 | return res; |
401 | } |
392 | } |
402 | } |
393 | } |
403 | req = async_send_1(vfs_phone, VFS_MKDIR, mode, NULL); |
394 | req = async_send_1(vfs_phone, VFS_MKDIR, mode, NULL); |
404 | rc = ipc_data_write_start(vfs_phone, pc, pc_len); |
395 | rc = ipc_data_write_start(vfs_phone, pa, pa_len); |
405 | if (rc != EOK) { |
396 | if (rc != EOK) { |
406 | async_wait_for(req, NULL); |
397 | async_wait_for(req, NULL); |
407 | async_serialize_end(); |
398 | async_serialize_end(); |
408 | futex_up(&vfs_phone_futex); |
399 | futex_up(&vfs_phone_futex); |
409 | free(pa); |
400 | free(pa); |
410 | return (int) rc; |
401 | return (int) rc; |
411 | } |
402 | } |
412 | async_wait_for(req, &rc); |
403 | async_wait_for(req, &rc); |
413 | async_serialize_end(); |
404 | async_serialize_end(); |
414 | futex_up(&vfs_phone_futex); |
405 | futex_up(&vfs_phone_futex); |
415 | free(pa); |
406 | free(pa); |
416 | return rc; |
407 | return rc; |
417 | } |
408 | } |
418 | 409 | ||
419 | static int _unlink(const char *path, int lflag) |
410 | static int _unlink(const char *path, int lflag) |
420 | { |
411 | { |
421 | int res; |
412 | int res; |
422 | ipcarg_t rc; |
413 | ipcarg_t rc; |
423 | aid_t req; |
414 | aid_t req; |
424 | 415 | ||
- | 416 | size_t pa_len; |
|
425 | char *pa = absolutize(path); |
417 | char *pa = absolutize(path, &pa_len); |
426 | if (!pa) |
418 | if (!pa) |
427 | return ENOMEM; |
419 | return ENOMEM; |
428 | size_t pc_len; |
- | |
429 | char *pc = canonify(pa, &pc_len); |
- | |
430 | if (!pc) { |
- | |
431 | free(pa); |
- | |
432 | return EINVAL; |
- | |
433 | } |
420 | |
434 | futex_down(&vfs_phone_futex); |
421 | futex_down(&vfs_phone_futex); |
435 | async_serialize_start(); |
422 | async_serialize_start(); |
436 | if (vfs_phone < 0) { |
423 | if (vfs_phone < 0) { |
437 | res = vfs_connect(); |
424 | res = vfs_connect(); |
438 | if (res < 0) { |
425 | if (res < 0) { |
439 | async_serialize_end(); |
426 | async_serialize_end(); |
440 | futex_up(&vfs_phone_futex); |
427 | futex_up(&vfs_phone_futex); |
441 | free(pa); |
428 | free(pa); |
442 | return res; |
429 | return res; |
443 | } |
430 | } |
444 | } |
431 | } |
445 | req = async_send_0(vfs_phone, VFS_UNLINK, NULL); |
432 | req = async_send_0(vfs_phone, VFS_UNLINK, NULL); |
446 | rc = ipc_data_write_start(vfs_phone, pc, pc_len); |
433 | rc = ipc_data_write_start(vfs_phone, pa, pa_len); |
447 | if (rc != EOK) { |
434 | if (rc != EOK) { |
448 | async_wait_for(req, NULL); |
435 | async_wait_for(req, NULL); |
449 | async_serialize_end(); |
436 | async_serialize_end(); |
450 | futex_up(&vfs_phone_futex); |
437 | futex_up(&vfs_phone_futex); |
451 | free(pa); |
438 | free(pa); |
452 | return (int) rc; |
439 | return (int) rc; |
453 | } |
440 | } |
454 | async_wait_for(req, &rc); |
441 | async_wait_for(req, &rc); |
455 | async_serialize_end(); |
442 | async_serialize_end(); |
456 | futex_up(&vfs_phone_futex); |
443 | futex_up(&vfs_phone_futex); |
457 | free(pa); |
444 | free(pa); |
458 | return rc; |
445 | return rc; |
459 | } |
446 | } |
460 | 447 | ||
461 | int unlink(const char *path) |
448 | int unlink(const char *path) |
462 | { |
449 | { |
463 | return _unlink(path, L_NONE); |
450 | return _unlink(path, L_NONE); |
464 | } |
451 | } |
465 | 452 | ||
466 | int rmdir(const char *path) |
453 | int rmdir(const char *path) |
467 | { |
454 | { |
468 | return _unlink(path, L_DIRECTORY); |
455 | return _unlink(path, L_DIRECTORY); |
469 | } |
456 | } |
470 | 457 | ||
471 | int rename(const char *old, const char *new) |
458 | int rename(const char *old, const char *new) |
472 | { |
459 | { |
473 | int res; |
460 | int res; |
474 | ipcarg_t rc; |
461 | ipcarg_t rc; |
475 | aid_t req; |
462 | aid_t req; |
476 | 463 | ||
- | 464 | size_t olda_len; |
|
477 | char *olda = absolutize(old); |
465 | char *olda = absolutize(old, &olda_len); |
478 | if (!olda) |
466 | if (!olda) |
479 | return ENOMEM; |
467 | return ENOMEM; |
- | 468 | ||
480 | size_t oldc_len; |
469 | size_t newa_len; |
481 | char *oldc = canonify(olda, &oldc_len); |
- | |
482 | if (!oldc) { |
- | |
483 | free(olda); |
- | |
484 | return EINVAL; |
- | |
485 | } |
- | |
486 | char *newa = absolutize(new); |
470 | char *newa = absolutize(new, &newa_len); |
487 | if (!newa) { |
471 | if (!newa) { |
488 | free(olda); |
472 | free(olda); |
489 | return ENOMEM; |
473 | return ENOMEM; |
490 | } |
474 | } |
491 | size_t newc_len; |
- | |
492 | char *newc = canonify(newa, &newc_len); |
- | |
493 | if (!newc) { |
- | |
494 | free(olda); |
- | |
495 | free(newa); |
- | |
496 | return EINVAL; |
- | |
497 | } |
- | |
498 | 475 | ||
499 | futex_down(&vfs_phone_futex); |
476 | futex_down(&vfs_phone_futex); |
500 | async_serialize_start(); |
477 | async_serialize_start(); |
501 | if (vfs_phone < 0) { |
478 | if (vfs_phone < 0) { |
502 | res = vfs_connect(); |
479 | res = vfs_connect(); |
503 | if (res < 0) { |
480 | if (res < 0) { |
504 | async_serialize_end(); |
481 | async_serialize_end(); |
505 | futex_up(&vfs_phone_futex); |
482 | futex_up(&vfs_phone_futex); |
506 | free(olda); |
483 | free(olda); |
507 | free(newa); |
484 | free(newa); |
508 | return res; |
485 | return res; |
509 | } |
486 | } |
510 | } |
487 | } |
511 | req = async_send_0(vfs_phone, VFS_RENAME, NULL); |
488 | req = async_send_0(vfs_phone, VFS_RENAME, NULL); |
512 | rc = ipc_data_write_start(vfs_phone, oldc, oldc_len); |
489 | rc = ipc_data_write_start(vfs_phone, olda, olda_len); |
513 | if (rc != EOK) { |
490 | if (rc != EOK) { |
514 | async_wait_for(req, NULL); |
491 | async_wait_for(req, NULL); |
515 | async_serialize_end(); |
492 | async_serialize_end(); |
516 | futex_up(&vfs_phone_futex); |
493 | futex_up(&vfs_phone_futex); |
517 | free(olda); |
494 | free(olda); |
518 | free(newa); |
495 | free(newa); |
519 | return (int) rc; |
496 | return (int) rc; |
520 | } |
497 | } |
521 | rc = ipc_data_write_start(vfs_phone, newc, newc_len); |
498 | rc = ipc_data_write_start(vfs_phone, newa, newa_len); |
522 | if (rc != EOK) { |
499 | if (rc != EOK) { |
523 | async_wait_for(req, NULL); |
500 | async_wait_for(req, NULL); |
524 | async_serialize_end(); |
501 | async_serialize_end(); |
525 | futex_up(&vfs_phone_futex); |
502 | futex_up(&vfs_phone_futex); |
526 | free(olda); |
503 | free(olda); |
527 | free(newa); |
504 | free(newa); |
528 | return (int) rc; |
505 | return (int) rc; |
529 | } |
506 | } |
530 | async_wait_for(req, &rc); |
507 | async_wait_for(req, &rc); |
531 | async_serialize_end(); |
508 | async_serialize_end(); |
532 | futex_up(&vfs_phone_futex); |
509 | futex_up(&vfs_phone_futex); |
533 | free(olda); |
510 | free(olda); |
534 | free(newa); |
511 | free(newa); |
535 | return rc; |
512 | return rc; |
536 | } |
513 | } |
537 | 514 | ||
538 | int chdir(const char *path) |
515 | int chdir(const char *path) |
539 | { |
516 | { |
- | 517 | size_t pa_len; |
|
540 | char *pa = absolutize(path); |
518 | char *pa = absolutize(path, &pa_len); |
541 | if (!pa) |
519 | if (!pa) |
542 | return ENOMEM; |
520 | return ENOMEM; |
543 | size_t pc_len; |
- | |
544 | char *pc = canonify(pa, &pc_len); |
- | |
545 | if (!pc) { |
- | |
546 | free(pa); |
- | |
547 | return ENOENT; |
- | |
548 | } |
- | |
549 | 521 | ||
550 | DIR *d = opendir(pc); |
522 | DIR *d = opendir(pa); |
551 | if (!d) { |
523 | if (!d) { |
552 | free(pa); |
524 | free(pa); |
553 | return ENOENT; |
525 | return ENOENT; |
554 | } |
526 | } |
555 | 527 | ||
556 | futex_down(&cwd_futex); |
528 | futex_down(&cwd_futex); |
557 | if (cwd_dir) { |
529 | if (cwd_dir) { |
558 | closedir(cwd_dir); |
530 | closedir(cwd_dir); |
559 | cwd_dir = NULL; |
531 | cwd_dir = NULL; |
560 | free(cwd_path); |
532 | free(cwd_path); |
561 | cwd_path = NULL; |
533 | cwd_path = NULL; |
562 | cwd_len = 0; |
534 | cwd_len = 0; |
563 | } |
535 | } |
564 | cwd_dir = d; |
536 | cwd_dir = d; |
565 | cwd_path = pc; |
537 | cwd_path = pa; |
566 | cwd_len = pc_len; |
538 | cwd_len = pa_len; |
567 | futex_up(&cwd_futex); |
539 | futex_up(&cwd_futex); |
568 | } |
540 | } |
569 | 541 | ||
570 | char *getcwd(char *buf, size_t size) |
542 | char *getcwd(char *buf, size_t size) |
571 | { |
543 | { |
572 | if (!size) |
544 | if (!size) |
573 | return NULL; |
545 | return NULL; |
574 | futex_down(&cwd_futex); |
546 | futex_down(&cwd_futex); |
575 | if (size < cwd_len + 1) { |
547 | if (size < cwd_len + 1) { |
576 | futex_up(&cwd_futex); |
548 | futex_up(&cwd_futex); |
577 | return NULL; |
549 | return NULL; |
578 | } |
550 | } |
579 | strcpy(buf, cwd_path); |
551 | strcpy(buf, cwd_path); |
580 | futex_up(&cwd_futex); |
552 | futex_up(&cwd_futex); |
581 | return buf; |
553 | return buf; |
582 | } |
554 | } |
583 | 555 | ||
584 | /** @} |
556 | /** @} |
585 | */ |
557 | */ |
586 | 558 |