ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/extfs_unix.cpp
(Generate patch)

Comparing BasiliskII/src/Unix/extfs_unix.cpp (file contents):
Revision 1.3 by cebix, 1999-10-21T22:40:01Z vs.
Revision 1.13 by cebix, 2000-07-21T18:01:07Z

# Line 1 | Line 1
1   /*
2   *  extfs_unix.cpp - MacOS file system for access native file system access, Unix specific stuff
3   *
4 < *  Basilisk II (C) 1997-1999 Christian Bauer
4 > *  Basilisk II (C) 1997-2000 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 60 | Line 60 | void extfs_exit(void)
60   *  Add component to path name
61   */
62  
63 < void add_path_component(char *path, const char *component, int max_len)
63 > void add_path_component(char *path, const char *component)
64   {
65          int l = strlen(path);
66 <        if (l < max_len-1 && path[l-1] != '/') {
66 >        if (l < MAX_PATH_LENGTH-1 && path[l-1] != '/') {
67                  path[l] = '/';
68                  path[l+1] = 0;
69          }
70 <        strncat(path, s, max_len-1);
70 >        strncat(path, component, MAX_PATH_LENGTH-1);
71   }
72  
73  
74   /*
75 < *  Get/set finder type/creator for file specified by full path
75 > *  Finder info and resource forks are kept in helper files
76 > *
77 > *  Finder info:
78 > *    /path/.finf/file
79 > *  Resource fork:
80 > *    /path/.rsrc/file
81 > *
82 > *  The .finf files store a FInfo/DInfo, followed by a FXInfo/DXInfo
83 > *  (16+16 bytes)
84 > */
85 >
86 > static void make_helper_path(const char *src, char *dest, const char *add, bool only_dir = false)
87 > {
88 >        dest[0] = 0;
89 >
90 >        // Get pointer to last component of path
91 >        const char *last_part = strrchr(src, '/');
92 >        if (last_part)
93 >                last_part++;
94 >        else
95 >                last_part = src;
96 >
97 >        // Copy everything before
98 >        strncpy(dest, src, last_part-src);
99 >        dest[last_part-src] = 0;
100 >
101 >        // Add additional component
102 >        strncat(dest, add, MAX_PATH_LENGTH-1);
103 >
104 >        // Add last component
105 >        if (!only_dir)
106 >                strncat(dest, last_part, MAX_PATH_LENGTH-1);
107 > }
108 >
109 > static int create_helper_dir(const char *path, const char *add)
110 > {
111 >        char helper_dir[MAX_PATH_LENGTH];
112 >        make_helper_path(path, helper_dir, add, true);
113 >        if (helper_dir[strlen(helper_dir) - 1] == '/')  // Remove trailing "/"
114 >                helper_dir[strlen(helper_dir) - 1] = 0;
115 >        return mkdir(helper_dir, 0777);
116 > }
117 >
118 > static int open_helper(const char *path, const char *add, int flag)
119 > {
120 >        char helper_path[MAX_PATH_LENGTH];
121 >        make_helper_path(path, helper_path, add);
122 >
123 >        if ((flag & O_ACCMODE) == O_RDWR || (flag & O_ACCMODE) == O_WRONLY)
124 >                flag |= O_CREAT;
125 >        int fd = open(helper_path, flag, 0666);
126 >        if (fd < 0) {
127 >                if (errno == ENOENT && (flag & O_CREAT)) {
128 >                        // One path component was missing, probably the helper
129 >                        // directory. Try to create it and re-open the file.
130 >                        int ret = create_helper_dir(path, add);
131 >                        if (ret < 0)
132 >                                return ret;
133 >                        fd = open(helper_path, flag, 0666);
134 >                }
135 >        }
136 >        return fd;
137 > }
138 >
139 > static int open_finf(const char *path, int flag)
140 > {
141 >        return open_helper(path, ".finf/", flag);
142 > }
143 >
144 > static int open_rsrc(const char *path, int flag)
145 > {
146 >        return open_helper(path, ".rsrc/", flag);
147 > }
148 >
149 >
150 > /*
151 > *  Get/set finder info for file/directory specified by full path
152   */
153  
154   struct ext2type {
# Line 113 | Line 189 | static const ext2type e2t_translation[]
189          {".tga", 'TPIC', 'ogle'},
190          {".tif", 'TIFF', 'ogle'},
191          {".tiff", 'TIFF', 'ogle'},
192 +        {".htm", 'TEXT', 'MOSS'},
193          {".html", 'TEXT', 'MOSS'},
194          {".txt", 'TEXT', 'ttxt'},
195          {".rtf", 'TEXT', 'MSWD'},
# Line 133 | Line 210 | static const ext2type e2t_translation[]
210          {".mov", 'MooV', 'TVOD'},
211          {".fli", 'FLI ', 'TVOD'},
212          {".avi", 'VfW ', 'TVOD'},
213 +        {".qxd", 'XDOC', 'XPR3'},
214 +        {".hfv", 'DDim', 'ddsk'},
215 +        {".dsk", 'DDim', 'ddsk'},
216 +        {".img", 'rohd', 'ddsk'},
217          {NULL, 0, 0}    // End marker
218   };
219  
220 < void get_finder_type(const char *path, uint32 &type, uint32 &creator)
220 > void get_finfo(const char *path, uint32 finfo, uint32 fxinfo)
221   {
222 <        type = 0;
223 <        creator = 0;
222 >        // Set default finder info
223 >        Mac_memset(finfo, 0, SIZEOF_FInfo);
224 >        if (fxinfo)
225 >                Mac_memset(fxinfo, 0, SIZEOF_FXInfo);
226 >        WriteMacInt16(finfo + fdFlags, DEFAULT_FINDER_FLAGS);
227 >        WriteMacInt32(finfo + fdLocation, (uint32)-1);
228 >
229 >        // Read Finder info file
230 >        int fd = open_finf(path, O_RDONLY);
231 >        if (fd >= 0) {
232 >                ssize_t actual = read(fd, Mac2HostAddr(finfo), SIZEOF_FInfo);
233 >                if (fxinfo)
234 >                        actual += read(fd, Mac2HostAddr(fxinfo), SIZEOF_FXInfo);
235 >                close(fd);
236 >                if (actual >= SIZEOF_FInfo)
237 >                        return;
238 >        }
239  
240 <        // Translate file name extension to MacOS type/creator
241 <        int path_len = strlen(path);
242 <        for (int i=0; e2t_translation[i].ext; i++) {
243 <                int ext_len = strlen(e2t_translation[i].ext);
244 <                if (path_len < ext_len)
245 <                        continue;
246 <                if (!strcmp(path + path_len - ext_len, e2t_translation[i].ext)) {
247 <                        type = e2t_translation[i].type;
248 <                        creator = e2t_translation[i].creator;
249 <                        break;
240 >        // No Finder info file, translate file name extension to MacOS type/creator
241 >        struct stat st;
242 >        if (stat(path, &st) == 0 && !S_ISDIR(st.st_mode)) {
243 >                int path_len = strlen(path);
244 >                for (int i=0; e2t_translation[i].ext; i++) {
245 >                        int ext_len = strlen(e2t_translation[i].ext);
246 >                        if (path_len < ext_len)
247 >                                continue;
248 >                        if (!strcmp(path + path_len - ext_len, e2t_translation[i].ext)) {
249 >                                WriteMacInt32(finfo + fdType, e2t_translation[i].type);
250 >                                WriteMacInt32(finfo + fdCreator, e2t_translation[i].creator);
251 >                                break;
252 >                        }
253                  }
254          }
255   }
256  
257 < void set_finder_type(const char *path, uint32 type, uint32 creator)
159 < {
160 < }
161 <
162 <
163 < /*
164 < *  Get/set finder flags for file/dir specified by full path (MACOS:HFS_FLAGS attribute)
165 < */
166 <
167 < void get_finder_flags(const char *path, uint16 &flags)
168 < {
169 <        flags = DEFAULT_FINDER_FLAGS;   // Default
170 < }
171 <
172 < void set_finder_flags(const char *path, uint16 flags)
257 > void set_finfo(const char *path, uint32 finfo, uint32 fxinfo)
258   {
259 +        // Open Finder info file
260 +        int fd = open_finf(path, O_RDWR);
261 +        if (fd < 0)
262 +                return;
263 +
264 +        // Write file
265 +        write(fd, Mac2HostAddr(finfo), SIZEOF_FInfo);
266 +        if (fxinfo)
267 +                write(fd, Mac2HostAddr(fxinfo), SIZEOF_FXInfo);
268 +        close(fd);
269   }
270  
271  
# Line 180 | Line 275 | void set_finder_flags(const char *path,
275  
276   uint32 get_rfork_size(const char *path)
277   {
278 <        return 0;
278 >        // Open resource file
279 >        int fd = open_rsrc(path, O_RDONLY);
280 >        if (fd < 0)
281 >                return 0;
282 >
283 >        // Get size
284 >        off_t size = lseek(fd, 0, SEEK_END);
285 >        
286 >        // Close file and return size
287 >        close(fd);
288 >        return size < 0 ? 0 : size;
289   }
290  
291   int open_rfork(const char *path, int flag)
292   {
293 <        return -1;
293 >        return open_rsrc(path, flag);
294   }
295  
296   void close_rfork(const char *path, int fd)
297   {
298 +        close(fd);
299   }
300  
301  
302   /*
303   *  Read "length" bytes from file to "buffer",
304 < *  returns number of bytes read (or 0)
304 > *  returns number of bytes read (or -1 on error)
305   */
306  
307 < size_t extfs_read(int fd, void *buffer, size_t length)
307 > ssize_t extfs_read(int fd, void *buffer, size_t length)
308   {
203        errno = 0;
309          return read(fd, buffer, length);
310   }
311  
312  
313   /*
314   *  Write "length" bytes from "buffer" to file,
315 < *  returns number of bytes written (or 0)
315 > *  returns number of bytes written (or -1 on error)
316   */
317  
318 < size_t extfs_write(int fd, void *buffer, size_t length)
318 > ssize_t extfs_write(int fd, void *buffer, size_t length)
319   {
215        errno = 0;
320          return write(fd, buffer, length);
321   }
322 +
323 +
324 + /*
325 + *  Remove file/directory (and associated helper files),
326 + *  returns false on error (and sets errno)
327 + */
328 +
329 + bool extfs_remove(const char *path)
330 + {
331 +        // Remove helpers first, don't complain if this fails
332 +        char helper_path[MAX_PATH_LENGTH];
333 +        make_helper_path(path, helper_path, ".finf/", false);
334 +        remove(helper_path);
335 +        make_helper_path(path, helper_path, ".rsrc/", false);
336 +        remove(helper_path);
337 +
338 +        // Now remove file or directory (and helper directories in the directory)
339 +        if (remove(path) < 0) {
340 +                if (errno == EISDIR || errno == ENOTEMPTY) {
341 +                        helper_path[0] = 0;
342 +                        strncpy(helper_path, path, MAX_PATH_LENGTH-1);
343 +                        add_path_component(helper_path, ".finf");
344 +                        rmdir(helper_path);
345 +                        helper_path[0] = 0;
346 +                        strncpy(helper_path, path, MAX_PATH_LENGTH-1);
347 +                        add_path_component(helper_path, ".rsrc");
348 +                        rmdir(helper_path);
349 +                        return rmdir(path) == 0;
350 +                } else
351 +                        return false;
352 +        }
353 +        return true;
354 + }
355 +
356 +
357 + /*
358 + *  Rename/move file/directory (and associated helper files),
359 + *  returns false on error (and sets errno)
360 + */
361 +
362 + bool extfs_rename(const char *old_path, const char *new_path)
363 + {
364 +        // Rename helpers first, don't complain if this fails
365 +        char old_helper_path[MAX_PATH_LENGTH], new_helper_path[MAX_PATH_LENGTH];
366 +        make_helper_path(old_path, old_helper_path, ".finf/", false);
367 +        make_helper_path(new_path, new_helper_path, ".finf/", false);
368 +        create_helper_dir(new_path, ".finf/");
369 +        rename(old_helper_path, new_helper_path);
370 +        make_helper_path(old_path, old_helper_path, ".rsrc/", false);
371 +        make_helper_path(new_path, new_helper_path, ".rsrc/", false);
372 +        create_helper_dir(new_path, ".rsrc/");
373 +        rename(old_helper_path, new_helper_path);
374 +
375 +        // Now rename file
376 +        return rename(old_path, new_path) == 0;
377 + }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines