Merge branch 'master' into xattrs

Author: 0x09

lib/libhfs/libhfs.c

@@ -2642,12 +2642,11 @@ hfslib_read_file_finderinfo(
 
 	ptr = in_bytes;
 
-#if 0
-	#pragma warn Fill in with real code!
-#endif
-	/* FIXME: Fill in with real code! */
-	memset(out_info, 0, sizeof(*out_info));
-	ptr = (uint8_t*)ptr + sizeof(hfs_macos_extended_file_info_t);
+	for(int i = 0; i < 4; i++)
+		out_info->reserved[i] = be16tohp(&ptr);
+	out_info->extended_finder_flags = be16tohp(&ptr);
+	out_info->reserved2 = be16tohp(&ptr);
+	out_info->put_away_folder_cnid = be32tohp(&ptr);
 
 	return ((uint8_t*)ptr - (uint8_t*)in_bytes);
 }
@@ -2662,12 +2661,14 @@ hfslib_read_folder_userinfo(void* in_bytes, hfs_macos_folder_info_t* out_info)
 
 	ptr = in_bytes;
 
-#if 0
-	#pragma warn Fill in with real code!
-#endif
-	/* FIXME: Fill in with real code! */
-	memset(out_info, 0, sizeof(*out_info));
-	ptr = (uint8_t*)ptr + sizeof(hfs_macos_folder_info_t);
+	out_info->window_bounds.t = be16tohp(&ptr);
+	out_info->window_bounds.l = be16tohp(&ptr);
+	out_info->window_bounds.b = be16tohp(&ptr);
+	out_info->window_bounds.r = be16tohp(&ptr);
+	out_info->finder_flags = be16tohp(&ptr);
+	out_info->location.v = be16tohp(&ptr);
+	out_info->location.h = be16tohp(&ptr);
+	out_info->reserved = be16tohp(&ptr);
 
 	return ((uint8_t*)ptr - (uint8_t*)in_bytes);
 }
@@ -2684,12 +2685,12 @@ hfslib_read_folder_finderinfo(
 
 	ptr = in_bytes;
 
-#if 0
-	#pragma warn Fill in with real code!
-#endif
-	/* FIXME: Fill in with real code! */
-	memset(out_info, 0, sizeof(*out_info));
-	ptr = (uint8_t*)ptr + sizeof(hfs_macos_extended_folder_info_t);
+	out_info->scroll_position.v = be16tohp(&ptr);
+	out_info->scroll_position.h = be16tohp(&ptr);
+	out_info->reserved = be32tohp(&ptr);
+	out_info->extended_finder_flags = be16tohp(&ptr);
+	out_info->reserved2 = be16tohp(&ptr);
+	out_info->put_away_folder_cnid = be32tohp(&ptr);
 
 	return ((uint8_t*)ptr - (uint8_t*)in_bytes);
 }

lib/libhfsuser/hfsuser.c

@@ -458,37 +458,26 @@ static inline char* swapcopy(char* buf, char* src, size_t size) {
 #define SWAPCOPY(buf, src) swapcopy((char*)(buf),(char*)&(src),sizeof((src)))
 
 void hfs_serialize_finderinfo(hfs_catalog_keyed_record_t* rec, char buf[32]) {
+	memset(buf,0,32);
 	if(rec->type == HFS_REC_FILE) {
 		buf = SWAPCOPY(buf, rec->file.user_info.file_type);
 		buf = SWAPCOPY(buf, rec->file.user_info.file_creator);
 		buf = SWAPCOPY(buf, rec->file.user_info.finder_flags);
 		buf = SWAPCOPY(buf, rec->file.user_info.location.v);
 		buf = SWAPCOPY(buf, rec->file.user_info.location.h);
-		buf = SWAPCOPY(buf, rec->file.user_info.reserved);
-
-		for(int i = 0; i < 4; i++)
-			buf = SWAPCOPY(buf, rec->file.finder_info.reserved[i]);
+		buf += 10;
 		buf = SWAPCOPY(buf, rec->file.finder_info.extended_finder_flags);
-		buf = SWAPCOPY(buf, rec->file.finder_info.reserved2);
-		buf = SWAPCOPY(buf, rec->file.finder_info.put_away_folder_cnid);
 	}
 	else if(rec->type == HFS_REC_FLDR) {
 		buf = SWAPCOPY(buf, rec->folder.user_info.window_bounds.t);
 		buf = SWAPCOPY(buf, rec->folder.user_info.window_bounds.l);
 		buf = SWAPCOPY(buf, rec->folder.user_info.window_bounds.b);
 		buf = SWAPCOPY(buf, rec->folder.user_info.window_bounds.r);
-
 		buf = SWAPCOPY(buf, rec->folder.user_info.finder_flags);
 		buf = SWAPCOPY(buf, rec->folder.user_info.location.v);
 		buf = SWAPCOPY(buf, rec->folder.user_info.location.h);
-		buf = SWAPCOPY(buf, rec->folder.user_info.reserved);
-
-		buf = SWAPCOPY(buf, rec->folder.finder_info.scroll_position.v);
-		buf = SWAPCOPY(buf, rec->folder.finder_info.scroll_position.h);
-		buf = SWAPCOPY(buf, rec->folder.finder_info.reserved);
+		buf += 10;
 		buf = SWAPCOPY(buf, rec->folder.finder_info.extended_finder_flags);
-		buf = SWAPCOPY(buf, rec->folder.finder_info.reserved2);
-		buf = SWAPCOPY(buf, rec->folder.finder_info.put_away_folder_cnid);
 	}
 }