ongoing GNUstep port

Author: znek

ChangeLog

@@ -1,3 +1,11 @@
+2011-02-06  Marcus Mueller  <[email protected]>
+
+	* GNUmakefile*, *.[hm]: ported to GNUstep
+
+	* Info.plist: it's 2011 by now
+
+	* iTunesFileSystem.m: fixed an uninitialized variable access
+
 2011-01-29  Marcus Mueller  <[email protected]>
 
 	* iTunesFSController.[hm]: removed. Added a new FUSEOFSAppController

GNUmakefile

@@ -10,6 +10,12 @@ endif
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
+
+ifneq ($(FOUNDATION_LIB),apple)
+ADDITIONAL_CPPFLAGS += -DNO_OSX_ADDITIONS
+endif
+
+
 GNUSTEP_INSTALLATION_DOMAIN = LOCAL
 
 APP_NAME = iTunesFS
@@ -18,7 +24,7 @@ iTunesFS_PRINCIPAL_CLASS  = NSApplication
 iTunesFS_APPLICATION_ICON = iTunesFS.tiff
 iTunesFS_MAIN_MODEL_FILE  = MainMenu.gorm
 iTunesFS_LANGUAGES        = English German French Italian Spanish Japanese
-iTunesFS_SUBPROJECTS      = FUSEOFS FUSEObjC-GNUstep
+iTunesFS_SUBPROJECTS      = FUSEOFS
 
 iTunesFS_OBJC_PRECOMPILED_HEADERS = common.h
 
@@ -27,18 +33,24 @@ iTunesFS_OBJC_FILES +=				\
 						\
 	iTunesLibrary.m				\
 	iPodLibrary.m				\
+	JBiPodLibrary.m				\
 	iTunesPlaylist.m			\
 	iTunesTrack.m				\
+	iTunesFormatFile.m			\
 	iTunesFSFormatter.m			\
 						\
 	Watchdog.m				\
 						\
+	StreamReader.m				\
 	NSString+Extensions.m			\
 	NSURL+Extensions.m			\
+	NSData+ZlibDecompression.m		\
 
 iTunesFS_LOCALIZED_RESOURCE_FILES +=		\
 	MainMenu.gorm				\
 	Localizable.strings			\
+	AlbumsTrackFormat.txt			\
+	PlaylistsTrackFormat.txt		\
 
 iTunesFS_RESOURCE_FILES +=			\
 	iTunesFS.tiff				\

GNUmakefile.preamble

@@ -2,4 +2,6 @@
 
 ADDITIONAL_GUI_LIBS     += -lfuse
 
-ADDITIONAL_INCLUDE_DIRS += -IFUSEOFS -IFUSEObjC-GNUstep
+ADDITIONAL_INCLUDE_DIRS += -IFUSEOFS -IFUSEOFS/GSFUSE
+
+ADDITIONAL_CPPFLAGS     += -std=c99

Info.plist

@@ -24,46 +24,44 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.2.0</string>
-	<key>FUSEFileSystemClass</key>
-	<string>iTunesFileSystem</string>
 	<key>LSUIElement</key>
 	<string>1</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2007-2010 Mulle kybernetiK.</string>
+	<string>Copyright 2007-2011 Mulle kybernetiK.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSUserDefaults</key>
 	<dict>
-    <key>FUSEObjectFileSystemClass</key>
-    <string>iTunesFileSystem</string>
+		<key>AlbumsTrackFormat</key>
+		<string>%(name).%(ext.lowercaseString)</string>
+		<key>AutoOpenInFinder</key>
+		<true/>
 		<key>FUSEMountName</key>
 		<string>iTunesFS</string>
 		<key>FUSEMountPath</key>
 		<string>/Volumes/iTunesFS</string>
-		<key>NoIPods</key>
-		<false/>
-		<key>AutoOpenInFinder</key>
-		<true/>
-		<key>SymbolicLinks</key>
+		<key>FUSEObjectFileSystemClass</key>
+		<string>iTunesFileSystem</string>
+		<key>iPodLibraryDebugEnabled</key>
 		<false/>
-		<key>UseCategories</key>
-		<true/>
 		<key>iTunesFileSystemDebugEnabled</key>
 		<false/>
 		<key>iTunesFSDebugPathLookup</key>
 		<false/>
-		<key>iPodLibraryDebugEnabled</key>
+		<key>NoIPods</key>
 		<false/>
-		<key>ShowFormatFiles</key>
-		<true/>
-		<key>AlbumsTrackFormat</key>
-		<string>%(name).%(ext.lowercaseString)</string>
 		<key>PlaylistsTrackFormat</key>
 		<string>%(playlistNumber#000) %(name).%(ext.lowercaseString)</string>
 		<key>PlaylistsTrackFormat[folders]</key>
 		<string>%(artist) / %(album) / %(trackNumber#00) %(name).%(ext.lowercaseString)</string>
+		<key>ShowFormatFiles</key>
+		<true/>
+		<key>SymbolicLinks</key>
+		<false/>
+		<key>UseCategories</key>
+		<true/>
 	</dict>
 </dict>
 </plist>

StreamReader.m

@@ -120,4 +120,4 @@ - (void)seekToOffset:(unsigned long long)_offset {
   self->offset = _offset;
 }
 
-@end // FileHandleStreamReader
+@end // FileHandleStreamReader

common.h

@@ -34,8 +34,8 @@
 #define	__iTunesFS_common_H_
 
 #ifdef __OBJC__
-#import <Cocoa/Cocoa.h>
-#import <MacFUSE/MacFUSE.h>
+#import <Foundation/Foundation.h>
+#import "FUSESupport.h"
 #endif
 
 #endif /* __iTunesFS_common_H_ */

iPodLibrary.m

@@ -37,9 +37,11 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 #import "NSObject+FUSEOFS.h"
 #import "iTunesPlaylist.h"
 #import "iTunesTrack.h"
-#import "NSImage+IconData.h"
 #import "NSData+ZlibDecompression.h"
 #import "StreamReader.h"
+#ifndef GNU_GUI_LIBRARY
+#import "NSImage+IconData.h"
+#endif
 
 #if __LP64__ || NS_BUILD_32_LIKE_64
   typedef unsigned int ITDBUInt32;
@@ -570,7 +572,11 @@ - (NSString *)mountPoint {
 
 - (NSData *)iconData {
   NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:self->mountPoint];
+#ifndef GNU_GUI_LIBRARY
   return [icon icnsDataWithWidth:512];
+#else
+  return [icon TIFFRepresentation];
+#endif
 }
 
 @end /* iPodLibrary */

iTunesFS.xcodeproj/project.pbxproj

@@ -74,11 +74,15 @@
 		AD37A2960C01C87E00DF1291 /* iTunesLibrary.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = iTunesLibrary.m; sourceTree = "<group>"; tabWidth = 2; usesTabs = 0; };
 		AD37A2BE0C01CFA800DF1291 /* README */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; lineEnding = 0; path = README; sourceTree = "<group>"; };
 		AD37A2C20C01CFB400DF1291 /* NOTES */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = NOTES; sourceTree = "<group>"; };
+		AD4C4ED912FDCAF90057C045 /* GMUserFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = GMUserFileSystem.h; sourceTree = "<group>"; tabWidth = 2; usesTabs = 0; };
+		AD4C4EDA12FDCAF90057C045 /* GMUserFileSystem.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = GMUserFileSystem.m; sourceTree = "<group>"; tabWidth = 2; usesTabs = 0; };
+		AD4C4EDB12FDCAF90057C045 /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; indentWidth = 8; path = GNUmakefile; sourceTree = "<group>"; tabWidth = 8; };
+		AD4C4EDD12FDCC7A0057C045 /* GSFUSE.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GSFUSE.h; sourceTree = "<group>"; };
+		AD4C4EE812FDCD690057C045 /* FUSESupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSESupport.h; sourceTree = "<group>"; };
+		AD4C4F2512FF0E050057C045 /* GMDataBackedFileDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = GMDataBackedFileDelegate.h; sourceTree = "<group>"; tabWidth = 2; usesTabs = 0; };
+		AD4C4F2612FF0E050057C045 /* GMDataBackedFileDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = GMDataBackedFileDelegate.m; sourceTree = "<group>"; tabWidth = 2; usesTabs = 0; };
+		AD4C4F2712FF0E050057C045 /* GMDTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GMDTrace.h; sourceTree = "<group>"; };
 		AD5A40700C214A1900B1A000 /* README-GNUstep */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "README-GNUstep"; sourceTree = "<group>"; };
-		AD5A407E0C214FCB00B1A000 /* FUSEFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = FUSEFileSystem.h; sourceTree = "<group>"; };
-		AD5A407F0C214FCB00B1A000 /* FUSEFileSystem.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = FUSEFileSystem.m; sourceTree = "<group>"; };
-		AD5A40800C214FCB00B1A000 /* FUSEMain.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = FUSEMain.m; sourceTree = "<group>"; };
-		AD5A40810C214FCB00B1A000 /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; path = GNUmakefile; sourceTree = "<group>"; tabWidth = 8; };
 		AD5A40820C214FCB00B1A000 /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile; sourceTree = "<group>"; tabWidth = 8; };
 		AD5A40830C214FCB00B1A000 /* GNUmakefile.preamble */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile.preamble; sourceTree = "<group>"; tabWidth = 8; };
 		AD5B5E7A0C0C1A70003B1650 /* NSObject+FUSEOFS.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = "NSObject+FUSEOFS.h"; sourceTree = "<group>"; tabWidth = 2; usesTabs = 0; };
@@ -154,7 +158,6 @@
 				08FB7795FE84155DC02AAC07 /* iTunesFS */,
 				AD5A407C0C214FAA00B1A000 /* GNUstep */,
 				7FEA82C10B456A36001441DE /* Resources */,
-				AD5A407D0C214FCB00B1A000 /* FUSEObjC-GNUstep */,
 				ADBDAB040C02F664004CF795 /* Scripts */,
 				AD95D4090C21C7AF00B96A36 /* examples */,
 				08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */,
@@ -226,6 +229,7 @@
 			isa = PBXGroup;
 			children = (
 				AD0073DC12F0131500E05C0D /* ChangeLog */,
+				AD4C4EE812FDCD690057C045 /* FUSESupport.h */,
 				AD5B5E7A0C0C1A70003B1650 /* NSObject+FUSEOFS.h */,
 				AD5B5E7B0C0C1A70003B1650 /* NSObject+FUSEOFS.m */,
 				AD0A21B512F44D3500339646 /* FUSEOFSAppController.h */,
@@ -247,24 +251,27 @@
 			path = FUSEOFS;
 			sourceTree = "<group>";
 		};
-		AD5A407C0C214FAA00B1A000 /* GNUstep */ = {
+		AD4C4EDC12FDCB080057C045 /* GSFUSE */ = {
 			isa = PBXGroup;
 			children = (
-				AD5A40820C214FCB00B1A000 /* GNUmakefile */,
-				AD5A40830C214FCB00B1A000 /* GNUmakefile.preamble */,
+				AD4C4EDB12FDCAF90057C045 /* GNUmakefile */,
+				AD4C4F2712FF0E050057C045 /* GMDTrace.h */,
+				AD4C4EDD12FDCC7A0057C045 /* GSFUSE.h */,
+				AD4C4ED912FDCAF90057C045 /* GMUserFileSystem.h */,
+				AD4C4EDA12FDCAF90057C045 /* GMUserFileSystem.m */,
+				AD4C4F2512FF0E050057C045 /* GMDataBackedFileDelegate.h */,
+				AD4C4F2612FF0E050057C045 /* GMDataBackedFileDelegate.m */,
 			);
-			name = GNUstep;
+			path = GSFUSE;
 			sourceTree = "<group>";
 		};
-		AD5A407D0C214FCB00B1A000 /* FUSEObjC-GNUstep */ = {
+		AD5A407C0C214FAA00B1A000 /* GNUstep */ = {
 			isa = PBXGroup;
 			children = (
-				AD5A40810C214FCB00B1A000 /* GNUmakefile */,
-				AD5A407E0C214FCB00B1A000 /* FUSEFileSystem.h */,
-				AD5A407F0C214FCB00B1A000 /* FUSEFileSystem.m */,
-				AD5A40800C214FCB00B1A000 /* FUSEMain.m */,
+				AD5A40820C214FCB00B1A000 /* GNUmakefile */,
+				AD5A40830C214FCB00B1A000 /* GNUmakefile.preamble */,
 			);
-			path = "FUSEObjC-GNUstep";
+			name = GNUstep;
 			sourceTree = "<group>";
 		};
 		AD81186F0F093D85000786C9 /* filesystems-objc-support */ = {
@@ -314,6 +321,7 @@
 			isa = PBXGroup;
 			children = (
 				ADDCD76C0C26A6640031B215 /* GNUmakefile */,
+				AD4C4EDC12FDCB080057C045 /* GSFUSE */,
 			);
 			name = GNUstep;
 			sourceTree = "<group>";

iTunesFileSystem.m

@@ -32,6 +32,7 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 
 #import "common.h"
 #import "iTunesFileSystem.h"
+#import "AppKit/AppKit.h"
 #import "iTunesLibrary.h"
 #import "iPodLibrary.h"
 #import "JBiPodLibrary.h"
@@ -260,7 +261,7 @@ - (void)didUnmountRemovableDevice:(NSNotification *)_notif {
   path = [[_notif userInfo] objectForKey:@"NSDevicePath"];
   lib  = [self->volMap objectForKey:path];
   if (lib) {
-    BOOL prevShowLibraries;
+    BOOL prevShowLibraries = [self showLibraries];
 
     if (doDebug)
       NSLog(@"Will remove library for unmounted iPod at path: %@", path);

iTunesFormatFile.m

@@ -228,6 +228,7 @@ - (NSData *)fileContents {
   return [super fileContents];
 }
 
+#ifndef NO_OSX_ADDITIONS
 - (NSDictionary *)extendedFileAttributes {
   if (!self->extAttrs) {
     static NSData *attrVal = nil;
@@ -244,5 +245,6 @@ - (NSDictionary *)extendedFileAttributes {
   }
   return [super extendedFileAttributes];
 }
+#endif
 
 @end /* iTunesFormatFile */

iTunesLibrary.m

@@ -39,7 +39,9 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 #import "Watchdog.h"
 #import "NSObject+FUSEOFS.h"
 #import "iTunesFSFormatter.h"
+#ifndef GNU_GUI_LIBRARY
 #import "NSImage+IconData.h"
+#endif
 
 @implementation iTunesLibrary
 

iTunesTrack.m

@@ -289,9 +289,13 @@ - (NSData *)fileContents {
     return [[self->url description] dataUsingEncoding:NSUTF8StringEncoding];
   }
   path = [self->url properlyEscapedPath];
+#if ! GNUSTEP_BASE_LIBRARY
   return [NSData dataWithContentsOfFile:path
                  options:NSUncachedRead
                  error:NULL];
+#else
+  return [NSData dataWithContentsOfFile:path];
+#endif
 }
 
 - (NSDictionary *)resourceAttributes {