--- BasiliskII/src/Unix/extfs_unix.cpp	1999/11/08 18:06:00	1.9
+++ BasiliskII/src/Unix/extfs_unix.cpp	2000/01/21 13:47:04	1.11
@@ -85,7 +85,7 @@ struct finf_struct {
 	uint32 type;
 	uint32 creator;
 	uint16 flags;
-	uint16 pad0;
+	uint8 pad0[22];	// total size: 32 bytes to match the size of FInfo+FXInfo
 };
 
 static void make_helper_path(const char *src, char *dest, const char *add, bool only_dir = false)
@@ -226,7 +226,7 @@ void get_finder_type(const char *path, u
 
 		// Read file
 		finf_struct finf;
-		if (read(fd, &finf, sizeof(finf_struct)) == sizeof(finf_struct)) {
+		if (read(fd, &finf, sizeof(finf_struct)) >= 8) {
 
 			// Type/creator are in Finder info file, return them
 			type = ntohl(finf.type);
@@ -259,7 +259,9 @@ void set_finder_type(const char *path, u
 		return;
 
 	// Read file
-	finf_struct finf = {0, 0, DEFAULT_FINDER_FLAGS, 0};
+	finf_struct finf;
+	finf.flags = DEFAULT_FINDER_FLAGS;
+	memset(&finf, 0, sizeof(finf_struct));
 	read(fd, &finf, sizeof(finf_struct));
 
 	// Set Finder flags
@@ -288,7 +290,7 @@ void get_finder_flags(const char *path,
 
 	// Read Finder flags
 	finf_struct finf;
-	if (read(fd, &finf, sizeof(finf_struct)) == sizeof(finf_struct))
+	if (read(fd, &finf, sizeof(finf_struct)) >= 10)
 		flags = ntohs(finf.flags);
 
 	// Close file
@@ -303,7 +305,9 @@ void set_finder_flags(const char *path,
 		return;
 
 	// Read file
-	finf_struct finf = {0, 0, DEFAULT_FINDER_FLAGS, 0};
+	finf_struct finf;
+	memset(&finf, 0, sizeof(finf_struct));
+	finf.flags = DEFAULT_FINDER_FLAGS;
 	read(fd, &finf, sizeof(finf_struct));
 
 	// Set Finder flags
@@ -348,24 +352,22 @@ void close_rfork(const char *path, int f
 
 /*
  *  Read "length" bytes from file to "buffer",
- *  returns number of bytes read (or 0)
+ *  returns number of bytes read (or -1 on error)
  */
 
-size_t extfs_read(int fd, void *buffer, size_t length)
+ssize_t extfs_read(int fd, void *buffer, size_t length)
 {
-	errno = 0;
 	return read(fd, buffer, length);
 }
 
 
 /*
  *  Write "length" bytes from "buffer" to file,
- *  returns number of bytes written (or 0)
+ *  returns number of bytes written (or -1 on error)
  */
 
-size_t extfs_write(int fd, void *buffer, size_t length)
+ssize_t extfs_write(int fd, void *buffer, size_t length)
 {
-	errno = 0;
 	return write(fd, buffer, length);
 }