--- BasiliskII/src/Unix/extfs_unix.cpp	1999/10/19 17:41:34	1.1
+++ BasiliskII/src/Unix/extfs_unix.cpp	1999/11/08 18:06:00	1.9
@@ -57,6 +57,100 @@ void extfs_exit(void)
 
 
 /*
+ *  Add component to path name
+ */
+
+void add_path_component(char *path, const char *component)
+{
+	int l = strlen(path);
+	if (l < MAX_PATH_LENGTH-1 && path[l-1] != '/') {
+		path[l] = '/';
+		path[l+1] = 0;
+	}
+	strncat(path, component, MAX_PATH_LENGTH-1);
+}
+
+
+/*
+ *  Finder info and resource forks are kept in helper files
+ *
+ *  Finder info:
+ *    /path/.finf/file
+ *  Resource fork:
+ *    /path/.rsrc/file
+ */
+
+// Layout of Finder info helper files (all fields big-endian)
+struct finf_struct {
+	uint32 type;
+	uint32 creator;
+	uint16 flags;
+	uint16 pad0;
+};
+
+static void make_helper_path(const char *src, char *dest, const char *add, bool only_dir = false)
+{
+	dest[0] = 0;
+
+	// Get pointer to last component of path
+	const char *last_part = strrchr(src, '/');
+	if (last_part)
+		last_part++;
+	else
+		last_part = src;
+
+	// Copy everything before
+	strncpy(dest, src, last_part-src);
+	dest[last_part-src] = 0;
+
+	// Add additional component
+	strncat(dest, add, MAX_PATH_LENGTH-1);
+
+	// Add last component
+	if (!only_dir)
+		strncat(dest, last_part, MAX_PATH_LENGTH-1);
+}
+
+static int create_helper_dir(const char *path, const char *add)
+{
+	char helper_dir[MAX_PATH_LENGTH];
+	make_helper_path(path, helper_dir, add, true);
+	return mkdir(helper_dir, 0777);
+}
+
+static int open_helper(const char *path, const char *add, int flag)
+{
+	char helper_path[MAX_PATH_LENGTH];
+	make_helper_path(path, helper_path, add);
+
+	if ((flag & O_ACCMODE) == O_RDWR || (flag & O_ACCMODE) == O_WRONLY)
+		flag |= O_CREAT;
+	int fd = open(helper_path, flag, 0666);
+	if (fd < 0) {
+		if (errno == ENOENT && (flag & O_CREAT)) {
+			// One path component was missing, probably the helper
+			// directory. Try to create it and re-open the file.
+			int ret = create_helper_dir(path, add);
+			if (ret < 0)
+				return ret;
+			fd = open(helper_path, flag, 0666);
+		}
+	}
+	return fd;
+}
+
+static int open_finf(const char *path, int flag)
+{
+	return open_helper(path, ".finf/", flag);
+}
+
+static int open_rsrc(const char *path, int flag)
+{
+	return open_helper(path, ".rsrc/", flag);
+}
+
+
+/*
  *  Get/set finder type/creator for file specified by full path
  */
 
@@ -67,7 +161,7 @@ struct ext2type {
 };
 
 static const ext2type e2t_translation[] = {
-	{".z", 'ZIVM', 'LZIV'},
+	{".Z", 'ZIVM', 'LZIV'},
 	{".gz", 'Gzip', 'Gzip'},
 	{".hqx", 'TEXT', 'SITx'},
 	{".pdf", 'PDF ', 'CARO'},
@@ -102,6 +196,7 @@ static const ext2type e2t_translation[]
 	{".txt", 'TEXT', 'ttxt'},
 	{".rtf", 'TEXT', 'MSWD'},
 	{".c", 'TEXT', 'R*ch'},
+	{".C", 'TEXT', 'R*ch'},
 	{".cc", 'TEXT', 'R*ch'},
 	{".cpp", 'TEXT', 'R*ch'},
 	{".cxx", 'TEXT', 'R*ch'},
@@ -110,6 +205,7 @@ static const ext2type e2t_translation[]
 	{".hpp", 'TEXT', 'R*ch'},
 	{".hxx", 'TEXT', 'R*ch'},
 	{".s", 'TEXT', 'R*ch'},
+	{".S", 'TEXT', 'R*ch'},
 	{".i", 'TEXT', 'R*ch'},
 	{".mpg", 'MPEG', 'TVOD'},
 	{".mpeg", 'MPEG', 'TVOD'},
@@ -124,7 +220,24 @@ void get_finder_type(const char *path, u
 	type = 0;
 	creator = 0;
 
-	// Translate file name extension to MacOS type/creator
+	// Open Finder info file
+	int fd = open_finf(path, O_RDONLY);
+	if (fd >= 0) {
+
+		// Read file
+		finf_struct finf;
+		if (read(fd, &finf, sizeof(finf_struct)) == sizeof(finf_struct)) {
+
+			// Type/creator are in Finder info file, return them
+			type = ntohl(finf.type);
+			creator = ntohl(finf.creator);
+			close(fd);
+			return;
+		}
+		close(fd);
+	}
+
+	// No Finder info file, translate file name extension to MacOS type/creator
 	int path_len = strlen(path);
 	for (int i=0; e2t_translation[i].ext; i++) {
 		int ext_len = strlen(e2t_translation[i].ext);
@@ -140,20 +253,66 @@ void get_finder_type(const char *path, u
 
 void set_finder_type(const char *path, uint32 type, uint32 creator)
 {
+	// Open Finder info file
+	int fd = open_finf(path, O_RDWR);
+	if (fd < 0)
+		return;
+
+	// Read file
+	finf_struct finf = {0, 0, DEFAULT_FINDER_FLAGS, 0};
+	read(fd, &finf, sizeof(finf_struct));
+
+	// Set Finder flags
+	finf.type = htonl(type);
+	finf.creator = htonl(creator);
+
+	// Update file
+	lseek(fd, 0, SEEK_SET);
+	write(fd, &finf, sizeof(finf_struct));
+	close(fd);
 }
 
 
 /*
- *  Get/set finder flags for file/dir specified by full path (MACOS:HFS_FLAGS attribute)
+ *  Get/set finder flags for file/dir specified by full path
  */
 
 void get_finder_flags(const char *path, uint16 &flags)
 {
 	flags = DEFAULT_FINDER_FLAGS;	// Default
+
+	// Open Finder info file
+	int fd = open_finf(path, O_RDONLY);
+	if (fd < 0)
+		return;
+
+	// Read Finder flags
+	finf_struct finf;
+	if (read(fd, &finf, sizeof(finf_struct)) == sizeof(finf_struct))
+		flags = ntohs(finf.flags);
+
+	// Close file
+	close(fd);
 }
 
 void set_finder_flags(const char *path, uint16 flags)
 {
+	// Open Finder info file
+	int fd = open_finf(path, O_RDWR);
+	if (fd < 0)
+		return;
+
+	// Read file
+	finf_struct finf = {0, 0, DEFAULT_FINDER_FLAGS, 0};
+	read(fd, &finf, sizeof(finf_struct));
+
+	// Set Finder flags
+	finf.flags = htons(flags);
+
+	// Update file
+	lseek(fd, 0, SEEK_SET);
+	write(fd, &finf, sizeof(finf_struct));
+	close(fd);
 }
 
 
@@ -163,16 +322,27 @@ void set_finder_flags(const char *path,
 
 uint32 get_rfork_size(const char *path)
 {
-	return 0;
+	// Open resource file
+	int fd = open_rsrc(path, O_RDONLY);
+	if (fd < 0)
+		return 0;
+
+	// Get size
+	off_t size = lseek(fd, 0, SEEK_END);
+	
+	// Close file and return size
+	close(fd);
+	return size < 0 ? 0 : size;
 }
 
 int open_rfork(const char *path, int flag)
 {
-	return -1;
+	return open_rsrc(path, flag);
 }
 
 void close_rfork(const char *path, int fd)
 {
+	close(fd);
 }
 
 
@@ -198,3 +368,59 @@ size_t extfs_write(int fd, void *buffer,
 	errno = 0;
 	return write(fd, buffer, length);
 }
+
+
+/*
+ *  Remove file/directory (and associated helper files),
+ *  returns false on error (and sets errno)
+ */
+
+bool extfs_remove(const char *path)
+{
+	// Remove helpers first, don't complain if this fails
+	char helper_path[MAX_PATH_LENGTH];
+	make_helper_path(path, helper_path, ".finf/", false);
+	remove(helper_path);
+	make_helper_path(path, helper_path, ".rsrc/", false);
+	remove(helper_path);
+
+	// Now remove file or directory (and helper directories in the directory)
+	if (remove(path) < 0) {
+		if (errno == EISDIR || errno == ENOTEMPTY) {
+			helper_path[0] = 0;
+			strncpy(helper_path, path, MAX_PATH_LENGTH-1);
+			add_path_component(helper_path, ".finf");
+			rmdir(helper_path);
+			helper_path[0] = 0;
+			strncpy(helper_path, path, MAX_PATH_LENGTH-1);
+			add_path_component(helper_path, ".rsrc");
+			rmdir(helper_path);
+			return rmdir(path) == 0;
+		} else
+			return false;
+	}
+	return true;
+}
+
+
+/*
+ *  Rename/move file/directory (and associated helper files),
+ *  returns false on error (and sets errno)
+ */
+
+bool extfs_rename(const char *old_path, const char *new_path)
+{
+	// Rename helpers first, don't complain if this fails
+	char old_helper_path[MAX_PATH_LENGTH], new_helper_path[MAX_PATH_LENGTH];
+	make_helper_path(old_path, old_helper_path, ".finf/", false);
+	make_helper_path(new_path, new_helper_path, ".finf/", false);
+	create_helper_dir(new_path, ".finf/");
+	rename(old_helper_path, new_helper_path);
+	make_helper_path(old_path, old_helper_path, ".rsrc/", false);
+	make_helper_path(new_path, new_helper_path, ".rsrc/", false);
+	create_helper_dir(new_path, ".rsrc/");
+	rename(old_helper_path, new_helper_path);
+
+	// Now rename file
+	return rename(old_path, new_path) == 0;
+}