diff --git a/File.cpp b/File.cpp index 05443d7..27be514 100644 --- a/File.cpp +++ b/File.cpp @@ -14,49 +14,7 @@ #include #include - -/* - * ProDOS technote 28 - * - * The following definition allows the same range of years that the Apple IIgs - * Control Panel CDA currently does: - * - * o A seven-bit ProDOS year value is in the range 0 to 99 - * (100 through 127 are invalid) - * o Year values from 40 to 99 represent 1940 through 1999 - * o Year values from 0 to 39 represent 2000 through 2039 - */ -/* - * A positive or 0 value for tm_isdst causes mktime() to presume initially - * that Daylight Savings Time, respectively, is or is not in effect for - * the specified time. A negative value for tm_isdst causes mktime() to - * attempt to determine whether Daylight Saving Time is in effect for the - * specified time. - */ -static time_t timeToUnix(unsigned yymmdd, unsigned hhmm) -{ - printf("%x %x\n", yymmdd, hhmm); - - if (yymmdd == 0) return 0; - - tm t; - bzero(&t, sizeof(tm)); - - t.tm_min = hhmm & 0x3f; - // tm_hour is 0-23, but is_dst -1 compensates - t.tm_hour = (hhmm >> 8) & 0x1f; - t.tm_isdst = -1; - - t.tm_mday = yymmdd & 0x1f; - t.tm_mon = ((yymmdd >> 5) & 0x0f) - 1; - t.tm_year = (yymmdd) >> 9; - - if (t.tm_year <= 39) t.tm_year += 100; - - return mktime(&t); - // convert back via locatime & fudge for dst? -} - +#include "DateTime.h" bool FileEntry::Load(const void *data) @@ -79,7 +37,7 @@ bool FileEntry::Load(const void *data) eof = load24(&cp[0x15]); - creation = timeToUnix(load16(&cp[0x18]), load16(&cp[0x1a])); + creation = ProDOS::DateTime(load16(&cp[0x18]), load16(&cp[0x1a])); //version = cp[0x1c]; //min_version = cp[0x1d]; @@ -103,7 +61,7 @@ bool FileEntry::Load(const void *data) aux_type = load16(&cp[0x1f]); - last_mod = timeToUnix(load16(&cp[0x21]), load16(&cp[0x23])); + last_mod = ProDOS::DateTime(load16(&cp[0x21]), load16(&cp[0x23])); header_pointer = load16(&cp[0x25]); @@ -177,8 +135,8 @@ bool VolumeEntry::Load(const void *data) // 0x14--0x1b reserved - creation = timeToUnix(load16(&cp[0x18]), load16(&cp[0x1a])); - last_mod = timeToUnix(load16(&cp[0x12]), load16(&cp[0x14])); + creation = ProDOS::DateTime(load16(&cp[0x18]), load16(&cp[0x1a])); + last_mod = ProDOS::DateTime(load16(&cp[0x12]), load16(&cp[0x14])); if (last_mod == 0) last_mod = creation; @@ -234,7 +192,7 @@ bool SubdirEntry::Load(const void *data) // 0x145-0x1b reserved - creation = timeToUnix(load16(&cp[0x18]), load16(&cp[0x1a])); + creation = ProDOS::DateTime(load16(&cp[0x18]), load16(&cp[0x1a])); //version = cp[0x1c]; //min_version = cp[0x1d]; diff --git a/profuse.xcodeproj/kelvin.mode1v3 b/profuse.xcodeproj/kelvin.mode1v3 index 39046fb..a8ecdd2 100644 --- a/profuse.xcodeproj/kelvin.mode1v3 +++ b/profuse.xcodeproj/kelvin.mode1v3 @@ -208,15 +208,13 @@ ChosenToolbarItems - active-target-popup - active-buildstyle-popup + active-combo-popup action NSToolbarFlexibleSpaceItem - buildOrClean - build-and-goOrGo + debugger-enable-breakpoints + build-and-go com.apple.ide.PBXToolbarStopButton get-info - toggle-editor NSToolbarFlexibleSpaceItem com.apple.pbx.toolbar.searchfield @@ -239,7 +237,6 @@ 1C37FBAC04509CD000000102 1C37FAAC04509CD000000102 - 1C08E77C0454961000C914BD 1C37FABC05509CD000000102 1C37FABC05539CD112110102 E2644B35053B69B200211256 @@ -282,13 +279,11 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 7 - 1 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {246, 509}} + {{0, 0}, {246, 873}} PBXTopSmartGroupGIDs @@ -300,7 +295,7 @@ GeometryConfiguration Frame - {{0, 0}, {263, 527}} + {{0, 0}, {263, 891}} GroupTreeTableConfiguration SCMStatusColumn @@ -309,7 +304,7 @@ 224 RubberWindowFrame - 75 119 1212 568 0 0 1920 1178 + 259 191 1361 932 0 0 1920 1178 Module PBXSmartGroupTreeModule @@ -325,7 +320,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - File.h + profuse_xattr.cpp PBXSplitModuleInNavigatorKey Split0 @@ -333,11 +328,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - File.h + profuse_xattr.cpp _historyCapacity 0 bookmark - B64E30810F2C0D2F000543FE + B67F09B01057622100A13214 history B6B767C80F0FFA3900D819C9 @@ -347,36 +342,17 @@ B6C786EE0F2A612600053681 B6C786EF0F2A612600053681 B6C786F70F2A64CC00053681 - B6C786F80F2A64CC00053681 B6C786F90F2A64CC00053681 B6C786FA0F2A64CC00053681 B6F4740F0F2ACB4700CB75DA B6E345420F2BB60B00B7FC78 B6E345610F2BC07F00B7FC78 - B64E307D0F2C0D2F000543FE - B64E307E0F2C0D2F000543FE - B6614B050EFF5F280073C4E7 - - prevStack - - B60E917F0EFD7E1E000E4348 - B60E91800EFD7E1E000E4348 - B60E91810EFD7E1E000E4348 - B60E922B0EFD94CA000E4348 - B60E929C0EFDA500000E4348 - B679E4BB0F02EFA200FB3F0C - B6B767CB0F0FFA3900D819C9 - B6B17F950F1136550060F7AA - B6B17FA80F1140160060F7AA - B6B7A8600F140BBB001024D2 - B6C786E90F2A5FF300053681 - B6C786EA0F2A5FF300053681 - B6C786F20F2A612600053681 - B6C786F30F2A612600053681 - B6C786FD0F2A64CC00053681 - B6F474110F2ACB4700CB75DA - B64E307F0F2C0D2F000543FE - B64E30800F2C0D2F000543FE + B64E309A0F2CD8F2000543FE + B6DA6C190FA6AFE90027FC1D + B67F09AC1057622100A13214 + B67F09AD1057622100A13214 + B67F09AE1057622100A13214 + B67F09AF1057622100A13214 SplitCount @@ -388,14 +364,14 @@ GeometryConfiguration Frame - {{0, 0}, {944, 349}} + {{0, 0}, {1093, 705}} RubberWindowFrame - 75 119 1212 568 0 0 1920 1178 + 259 191 1361 932 0 0 1920 1178 Module PBXNavigatorGroup Proportion - 349pt + 705pt ContentConfiguration @@ -408,18 +384,18 @@ GeometryConfiguration Frame - {{0, 354}, {944, 173}} + {{0, 710}, {1093, 181}} RubberWindowFrame - 75 119 1212 568 0 0 1920 1178 + 259 191 1361 932 0 0 1920 1178 Module XCDetailModule Proportion - 173pt + 181pt Proportion - 944pt + 1093pt Name @@ -434,12 +410,14 @@ TableOfContents - B64E30820F2C0D2F000543FE + B67F097610575F0E00A13214 1CE0B1FE06471DED0097A5F4 - B64E30830F2C0D2F000543FE + B67F097710575F0E00A13214 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 + ToolbarConfigUserDefaultsMinorVersion + 2 ToolbarConfiguration xcode.toolbar.config.defaultV3 @@ -570,11 +548,13 @@ 5 WindowOrderList + 1CD10A99069EF8BA00B06720 + B67F09B71057622100A13214 + B60E918C0EFD7E1E000E4348 /Users/kelvin/Projects/profuse/profuse.xcodeproj - B64E30840F2C0D2F000543FE WindowString - 75 119 1212 568 0 0 1920 1178 + 259 191 1361 932 0 0 1920 1178 WindowToolsV3 @@ -590,8 +570,6 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -606,7 +584,7 @@ Frame {{0, 0}, {857, 500}} RubberWindowFrame - 621 136 857 922 0 0 1920 1178 + 925 143 857 922 0 0 1920 1178 Module PBXNavigatorGroup @@ -614,14 +592,14 @@ 500pt + BecomeActive + ContentConfiguration - PBXBuildLogShowsTranscriptDefaultKey - {{0, 5}, {857, 371}} PBXProjectModuleGUID XCMainBuildResultsModuleGUID PBXProjectModuleLabel - Build + Build Results XCBuildResultsTrigger_Collapse 1021 XCBuildResultsTrigger_Open @@ -632,7 +610,7 @@ Frame {{0, 505}, {857, 376}} RubberWindowFrame - 621 136 857 922 0 0 1920 1178 + 925 143 857 922 0 0 1920 1178 Module PBXBuildResultsModule @@ -655,18 +633,18 @@ TableOfContents B60E918C0EFD7E1E000E4348 - B64E30630F2C08EF000543FE + B67F097410575F0600A13214 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID ToolbarConfiguration xcode.toolbar.config.buildV3 WindowString - 621 136 857 922 0 0 1920 1178 + 925 143 857 922 0 0 1920 1178 WindowToolGUID B60E918C0EFD7E1E000E4348 WindowToolIsVisible - + FirstTimeWindowDisplayed @@ -775,13 +753,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - B64E30640F2C08EF000543FE + B67F09B11057622100A13214 1C162984064C10D400B95A72 - B64E30650F2C08EF000543FE - B64E30660F2C08EF000543FE - B64E30670F2C08EF000543FE - B64E30680F2C08EF000543FE - B64E30690F2C08EF000543FE + B67F09B21057622100A13214 + B67F09B31057622100A13214 + B67F09B41057622100A13214 + B67F09B51057622100A13214 + B67F09B61057622100A13214 ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -1007,7 +985,7 @@ PBXProjectModuleGUID 1C78EAB2065D492600B07095 PBXProjectModuleLabel - File.cpp + profuse_xattr.cpp StatusBarVisibility @@ -1084,7 +1062,7 @@ TableOfContents B60E929F0EFDA500000E4348 - B6E345600F2BC07D00B7FC78 + B6472E660FB732A400DFAB7C 1C78EAB2065D492600B07095 1CD052920623707200166675 diff --git a/profuse.xcodeproj/kelvin.pbxuser b/profuse.xcodeproj/kelvin.pbxuser index 6697b70..6e32f4e 100644 --- a/profuse.xcodeproj/kelvin.pbxuser +++ b/profuse.xcodeproj/kelvin.pbxuser @@ -2,8 +2,9 @@ { 08FB7793FE84155DC02AAC07 /* Project object */ = { activeArchitecturePreference = i386; - activeBuildConfigurationName = "Debug Universal 10.4"; + activeBuildConfigurationName = "Debug 10.6"; activeExecutable = B60E914A0EFB3612000E4348 /* profuse */; + activeSDKPreference = macosx10.6; activeTarget = 8DD76F620486A84900D96B5E /* profuse */; addToTargets = ( 8DD76F620486A84900D96B5E /* profuse */, @@ -39,7 +40,7 @@ PBXFileTableDataSourceColumnWidthsKey = ( 22, 300, - 593, + 742, ); PBXFileTableDataSourceColumnsKey = ( PBXExecutablesDataSource_ActiveFlagID, @@ -52,7 +53,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 705, + 854, 20, 48, 43, @@ -75,7 +76,7 @@ PBXFileTableDataSourceColumnWidthsKey = ( 20, 20, - 681, + 830, 20, 48, 43, @@ -115,49 +116,33 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 254545182; - PBXWorkspaceStateSaveDate = 254545182; + PBXPerProjectTemplateStateSaveDate = 274161393; + PBXWorkspaceStateSaveDate = 274161393; }; perUserProjectItems = { - B60E917F0EFD7E1E000E4348 = B60E917F0EFD7E1E000E4348 /* PBXTextBookmark */; - B60E91800EFD7E1E000E4348 = B60E91800EFD7E1E000E4348 /* PBXTextBookmark */; - B60E91810EFD7E1E000E4348 = B60E91810EFD7E1E000E4348 /* PBXTextBookmark */; - B60E922B0EFD94CA000E4348 = B60E922B0EFD94CA000E4348 /* PBXTextBookmark */; - B60E929C0EFDA500000E4348 = B60E929C0EFDA500000E4348 /* PBXTextBookmark */; + B6108A660FDA0E0700D2D63B = B6108A660FDA0E0700D2D63B /* PBXTextBookmark */; B642F1540F133632001F7696 = B642F1540F133632001F7696 /* PBXTextBookmark */; B642F16A0F1341D4001F7696 = B642F16A0F1341D4001F7696 /* PBXTextBookmark */; - B64E306A0F2C08F3000543FE = B64E306A0F2C08F3000543FE /* PBXTextBookmark */; - B64E306B0F2C08F3000543FE = B64E306B0F2C08F3000543FE /* PBXTextBookmark */; - B64E306C0F2C08F3000543FE = B64E306C0F2C08F3000543FE /* PBXTextBookmark */; - B64E306F0F2C0900000543FE = B64E306F0F2C0900000543FE /* PBXTextBookmark */; - B64E307D0F2C0D2F000543FE /* PBXTextBookmark */ = B64E307D0F2C0D2F000543FE /* PBXTextBookmark */; - B64E307E0F2C0D2F000543FE /* PBXTextBookmark */ = B64E307E0F2C0D2F000543FE /* PBXTextBookmark */; - B64E307F0F2C0D2F000543FE /* PBXTextBookmark */ = B64E307F0F2C0D2F000543FE /* PBXTextBookmark */; - B64E30800F2C0D2F000543FE /* PBXTextBookmark */ = B64E30800F2C0D2F000543FE /* PBXTextBookmark */; - B64E30810F2C0D2F000543FE /* PBXTextBookmark */ = B64E30810F2C0D2F000543FE /* PBXTextBookmark */; - B6614B050EFF5F280073C4E7 = B6614B050EFF5F280073C4E7 /* PBXTextBookmark */; - B679E4BB0F02EFA200FB3F0C = B679E4BB0F02EFA200FB3F0C /* PBXTextBookmark */; - B6B17F950F1136550060F7AA = B6B17F950F1136550060F7AA /* PBXTextBookmark */; - B6B17FA80F1140160060F7AA = B6B17FA80F1140160060F7AA /* PBXTextBookmark */; + B64E307E0F2C0D2F000543FE = B64E307E0F2C0D2F000543FE /* PBXTextBookmark */; + B64E309A0F2CD8F2000543FE = B64E309A0F2CD8F2000543FE /* PBXTextBookmark */; + B6706BEC10575D48004C8120 = B6706BEC10575D48004C8120 /* PBXTextBookmark */; + B67F097510575F0E00A13214 /* PBXTextBookmark */ = B67F097510575F0E00A13214 /* PBXTextBookmark */; + B67F09AC1057622100A13214 /* PBXTextBookmark */ = B67F09AC1057622100A13214 /* PBXTextBookmark */; + B67F09AD1057622100A13214 /* PBXTextBookmark */ = B67F09AD1057622100A13214 /* PBXTextBookmark */; + B67F09AE1057622100A13214 /* PBXTextBookmark */ = B67F09AE1057622100A13214 /* PBXTextBookmark */; + B67F09AF1057622100A13214 /* XCBuildMessageTextBookmark */ = B67F09AF1057622100A13214 /* XCBuildMessageTextBookmark */; + B67F09B01057622100A13214 /* PBXTextBookmark */ = B67F09B01057622100A13214 /* PBXTextBookmark */; B6B767C80F0FFA3900D819C9 = B6B767C80F0FFA3900D819C9 /* PBXTextBookmark */; - B6B767CB0F0FFA3900D819C9 = B6B767CB0F0FFA3900D819C9 /* PBXTextBookmark */; - B6B7A8600F140BBB001024D2 = B6B7A8600F140BBB001024D2 /* PBXTextBookmark */; B6C786E50F2A5FF300053681 = B6C786E50F2A5FF300053681 /* PBXTextBookmark */; - B6C786E90F2A5FF300053681 = B6C786E90F2A5FF300053681 /* PBXTextBookmark */; - B6C786EA0F2A5FF300053681 = B6C786EA0F2A5FF300053681 /* PBXTextBookmark */; B6C786EE0F2A612600053681 = B6C786EE0F2A612600053681 /* PBXTextBookmark */; B6C786EF0F2A612600053681 = B6C786EF0F2A612600053681 /* PBXTextBookmark */; - B6C786F20F2A612600053681 = B6C786F20F2A612600053681 /* PBXTextBookmark */; - B6C786F30F2A612600053681 = B6C786F30F2A612600053681 /* PBXTextBookmark */; B6C786F70F2A64CC00053681 = B6C786F70F2A64CC00053681 /* PBXTextBookmark */; - B6C786F80F2A64CC00053681 = B6C786F80F2A64CC00053681 /* PBXTextBookmark */; B6C786F90F2A64CC00053681 = B6C786F90F2A64CC00053681 /* PBXTextBookmark */; B6C786FA0F2A64CC00053681 = B6C786FA0F2A64CC00053681 /* PBXTextBookmark */; - B6C786FD0F2A64CC00053681 = B6C786FD0F2A64CC00053681 /* PBXTextBookmark */; + B6DA6C190FA6AFE90027FC1D = B6DA6C190FA6AFE90027FC1D /* PBXTextBookmark */; B6E345420F2BB60B00B7FC78 = B6E345420F2BB60B00B7FC78 /* PBXTextBookmark */; B6E345610F2BC07F00B7FC78 = B6E345610F2BC07F00B7FC78 /* PBXTextBookmark */; B6F4740F0F2ACB4700CB75DA = B6F4740F0F2ACB4700CB75DA /* PBXTextBookmark */; - B6F474110F2ACB4700CB75DA = B6F474110F2ACB4700CB75DA /* PBXTextBookmark */; }; sourceControlManager = B60E91500EFB3628000E4348 /* Source Control */; userBuildSettings = { @@ -188,6 +173,9 @@ configStateDict = { }; customDataFormattersEnabled = 1; + dataTipCustomDataFormattersEnabled = 1; + dataTipShowTypeColumn = 1; + dataTipSortType = 0; debuggerPlugin = GDBDebugging; disassemblyDisplayState = 0; dylibVariantSuffix = ""; @@ -200,6 +188,7 @@ name = profuse; savedGlobals = { }; + showTypeColumn = 0; sourceDirectories = ( ); variableFormatDictionary = { @@ -210,17 +199,17 @@ }; B60E914D0EFB3627000E4348 /* File.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {883, 1792}}"; - sepNavSelRange = "{414, 0}"; - sepNavVisRange = "{1197, 440}"; + sepNavIntBoundsRect = "{{0, 0}, {996, 1974}}"; + sepNavSelRange = "{273, 23}"; + sepNavVisRange = "{0, 1003}"; sepNavWindowFrame = "{{95, -86}, {555, 1173}}"; }; }; B60E914E0EFB3628000E4348 /* File.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {883, 3682}}"; + sepNavIntBoundsRect = "{{0, 0}, {1032, 2977}}"; sepNavSelRange = "{3323, 0}"; - sepNavVisRange = "{1285, 523}"; + sepNavVisRange = "{1039, 1166}"; sepNavWindowFrame = "{{667, -9}, {555, 1173}}"; }; }; @@ -230,6 +219,9 @@ isSCMEnabled = 0; scmConfiguration = { repositoryName = profuse.googlecode.com; + repositoryNamesForRoots = { + "" = profuse.googlecode.com; + }; }; }; B60E91510EFB3628000E4348 /* Code sense */ = { @@ -246,9 +238,9 @@ }; B60E91540EFB51FE000E4348 /* Disk.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {883, 8652}}"; - sepNavSelRange = "{5288, 0}"; - sepNavVisRange = "{5127, 457}"; + sepNavIntBoundsRect = "{{0, 0}, {1032, 8414}}"; + sepNavSelRange = "{5390, 0}"; + sepNavVisRange = "{4914, 1006}"; sepNavWindowFrame = "{{943, -6}, {692, 1171}}"; }; }; @@ -260,36 +252,6 @@ sepNavWindowFrame = "{{15, 2}, {692, 1171}}"; }; }; - B60E917F0EFD7E1E000E4348 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B60E914D0EFB3627000E4348 /* File.h */; - name = "File.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 350; - vrLoc = 0; - }; - B60E91800EFD7E1E000E4348 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B60E91530EFB51FE000E4348 /* Disk.h */; - name = "Disk.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 159; - vrLoc = 0; - }; - B60E91810EFD7E1E000E4348 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B60E91540EFB51FE000E4348 /* Disk.cpp */; - name = "Disk.cpp: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 292; - vrLoc = 0; - }; B60E91C10EFD8049000E4348 /* xmain.cpp:129 */ = { isa = PBXFileBreakpoint; actions = ( @@ -305,18 +267,9 @@ lineNumber = 129; location = "ProDOS-Fuse"; modificationTime = 251949619.113675; + originalNumberOfMultipleMatches = 0; state = 2; }; - B60E922B0EFD94CA000E4348 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B60E91580EFD77E3000E4348 /* common.h */; - name = "common.h: 14"; - rLen = 0; - rLoc = 146; - rType = 0; - vrLen = 327; - vrLoc = 0; - }; B60E92720EFDA086000E4348 /* File.cpp:74 */ = { isa = PBXFileBreakpoint; actions = ( @@ -332,17 +285,18 @@ lineNumber = 74; location = "ProDOS-Fuse"; modificationTime = 251949619.113693; + originalNumberOfMultipleMatches = 0; state = 2; }; - B60E929C0EFDA500000E4348 /* PBXTextBookmark */ = { + B6108A660FDA0E0700D2D63B /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = B60E914E0EFB3628000E4348 /* File.cpp */; - name = "File.cpp: 106"; + fRef = B6C786B40F2A59FE00053681 /* profuse_xattr.cpp */; + name = "profuse_xattr.cpp: 178"; rLen = 0; - rLoc = 3323; + rLoc = 4165; rType = 0; - vrLen = 345; - vrLoc = 1359; + vrLen = 1035; + vrLoc = 3525; }; B642F1290F132FA3001F7696 /* UniversalDiskImage.h */ = { uiCtxt = { @@ -380,54 +334,6 @@ vrLen = 313; vrLoc = 0; }; - B64E306A0F2C08F3000543FE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B60E914E0EFB3628000E4348 /* File.cpp */; - name = "File.cpp: 176"; - rLen = 0; - rLoc = 3323; - rType = 0; - vrLen = 532; - vrLoc = 1287; - }; - B64E306B0F2C08F3000543FE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "error: 'DATA_FORK' was not declared in this scope"; - fRef = B60E91540EFB51FE000E4348 /* Disk.cpp */; - rLen = 1; - rLoc = 239; - rType = 1; - }; - B64E306C0F2C08F3000543FE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B60E914E0EFB3628000E4348 /* File.cpp */; - name = "File.cpp: 176"; - rLen = 0; - rLoc = 3323; - rType = 0; - vrLen = 532; - vrLoc = 1287; - }; - B64E306F0F2C0900000543FE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B60E91540EFB51FE000E4348 /* Disk.cpp */; - name = "Disk.cpp: 240"; - rLen = 0; - rLoc = 5288; - rType = 0; - vrLen = 457; - vrLoc = 5127; - }; - B64E307D0F2C0D2F000543FE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B60E91540EFB51FE000E4348 /* Disk.cpp */; - name = "Disk.cpp: 240"; - rLen = 0; - rLoc = 5288; - rType = 0; - vrLen = 457; - vrLoc = 5127; - }; B64E307E0F2C0D2F000543FE /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = B60E914E0EFB3628000E4348 /* File.cpp */; @@ -438,27 +344,7 @@ vrLen = 523; vrLoc = 1285; }; - B64E307F0F2C0D2F000543FE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B60E91540EFB51FE000E4348 /* Disk.cpp */; - name = "Disk.cpp: 240"; - rLen = 0; - rLoc = 5288; - rType = 0; - vrLen = 457; - vrLoc = 5127; - }; - B64E30800F2C0D2F000543FE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B60E914E0EFB3628000E4348 /* File.cpp */; - name = "File.cpp: 156"; - rLen = 0; - rLoc = 3323; - rType = 0; - vrLen = 523; - vrLoc = 1285; - }; - B64E30810F2C0D2F000543FE /* PBXTextBookmark */ = { + B64E309A0F2CD8F2000543FE /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = B60E914D0EFB3627000E4348 /* File.h */; name = "File.h: 30"; @@ -468,15 +354,15 @@ vrLen = 440; vrLoc = 1197; }; - B6614B050EFF5F280073C4E7 /* PBXTextBookmark */ = { + B6706BEC10575D48004C8120 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = B60E914D0EFB3627000E4348 /* File.h */; - name = "File.h: 31"; + fRef = B6C786B40F2A59FE00053681 /* profuse_xattr.cpp */; + name = "profuse_xattr.cpp: 178"; rLen = 0; - rLoc = 414; + rLoc = 4165; rType = 0; - vrLen = 330; - vrLoc = 1231; + vrLen = 1154; + vrLoc = 3442; }; B679E4A70F02E79300FB3F0C /* main.cpp */ = { uiCtxt = { @@ -486,16 +372,79 @@ sepNavWindowFrame = "{{342, 156}, {1412, 924}}"; }; }; - B679E4BB0F02EFA200FB3F0C /* PBXTextBookmark */ = { + B67F097510575F0E00A13214 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = B679E4A70F02E79300FB3F0C /* main.cpp */; - name = "main.cpp: 1"; + fRef = B6C786B40F2A59FE00053681 /* profuse_xattr.cpp */; + name = "profuse_xattr.cpp: 178"; + rLen = 0; + rLoc = 4165; + rType = 0; + vrLen = 1073; + vrLoc = 3523; + }; + B67F097810575F8300A13214 /* DateTime.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1032, 1924}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1083}"; + }; + }; + B67F097A10575FD900A13214 /* DateTime.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1032, 1170}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 947}"; + }; + }; + B67F09AC1057622100A13214 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B67F097A10575FD900A13214 /* DateTime.h */; + name = "DateTime.h: 1"; rLen = 0; rLoc = 0; rType = 0; - vrLen = 356; + vrLen = 947; vrLoc = 0; }; + B67F09AD1057622100A13214 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B67F097810575F8300A13214 /* DateTime.cpp */; + name = "DateTime.cpp: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1083; + vrLoc = 0; + }; + B67F09AE1057622100A13214 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B60E914E0EFB3628000E4348 /* File.cpp */; + name = "File.cpp: 151"; + rLen = 0; + rLoc = 3323; + rType = 0; + vrLen = 1166; + vrLoc = 1039; + }; + B67F09AF1057622100A13214 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Format '%u' expects type 'unsigned int', but argument 3 has type 'fuse_ino_t'"; + fRef = B6C786B40F2A59FE00053681 /* profuse_xattr.cpp */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 377; + rType = 1; + }; + B67F09B01057622100A13214 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B6C786B40F2A59FE00053681 /* profuse_xattr.cpp */; + name = "profuse_xattr.cpp: 378"; + rLen = 0; + rLoc = 8340; + rType = 0; + vrLen = 948; + vrLoc = 7739; + }; B6AE1CFF0F0335FC00D36ADB /* main.cpp:20 */ = { isa = PBXFileBreakpoint; actions = ( @@ -511,6 +460,7 @@ lineNumber = 20; location = "ProDOS-Fuse"; modificationTime = 251949619.113812; + originalNumberOfMultipleMatches = 0; state = 2; }; B6B17F820F103AA70060F7AA /* fuse_common.h */ = { @@ -520,16 +470,6 @@ path = /usr/local/include/fuse/fuse_common.h; sourceTree = ""; }; - B6B17F950F1136550060F7AA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B6B17F820F103AA70060F7AA /* fuse_common.h */; - name = "fuse_common.h: 36"; - rLen = 0; - rLoc = 921; - rType = 0; - vrLen = 579; - vrLoc = 535; - }; B6B17FA00F1138830060F7AA /* DiskCopy42.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1353, 796}}"; @@ -546,16 +486,6 @@ sepNavWindowFrame = "{{299, 31}, {1412, 924}}"; }; }; - B6B17FA80F1140160060F7AA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B6B17FA00F1138830060F7AA /* DiskCopy42.h */; - name = "DiskCopy42.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 374; - vrLoc = 0; - }; B6B767C80F0FFA3900D819C9 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = B6DBB4E70F0C6BBD00F385F2 /* profuse.1 */; @@ -566,26 +496,6 @@ vrLen = 722; vrLoc = 2400; }; - B6B767CB0F0FFA3900D819C9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B6DBB4E70F0C6BBD00F385F2 /* profuse.1 */; - name = "profuse.1: 10"; - rLen = 0; - rLoc = 429; - rType = 0; - vrLen = 722; - vrLoc = 2400; - }; - B6B7A8600F140BBB001024D2 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B6B17FA10F1138830060F7AA /* DiskCopy42.cpp */; - name = "DiskCopy42.cpp: 11"; - rLen = 0; - rLoc = 150; - rType = 0; - vrLen = 333; - vrLoc = 0; - }; B6C786B30F2A59AF00053681 /* profuse.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {796, 728}}"; @@ -595,30 +505,30 @@ }; B6C786B40F2A59FE00053681 /* profuse_xattr.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1250, 5138}}"; - sepNavSelRange = "{3730, 0}"; - sepNavVisRange = "{3045, 1256}"; + sepNavIntBoundsRect = "{{0, 0}, {1032, 7618}}"; + sepNavSelRange = "{8340, 0}"; + sepNavVisRange = "{7739, 948}"; }; }; B6C786BB0F2A5C0800053681 /* profuse_dirent.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {796, 1792}}"; - sepNavSelRange = "{974, 0}"; - sepNavVisRange = "{1797, 951}"; + sepNavIntBoundsRect = "{{0, 0}, {1198, 1781}}"; + sepNavSelRange = "{1946, 0}"; + sepNavVisRange = "{756, 1661}"; }; }; B6C786BF0F2A5CC000053681 /* profuse_stat.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1250, 3038}}"; - sepNavSelRange = "{3676, 0}"; - sepNavVisRange = "{3020, 1612}"; + sepNavIntBoundsRect = "{{0, 0}, {1198, 3016}}"; + sepNavSelRange = "{3216, 0}"; + sepNavVisRange = "{2120, 1512}"; }; }; B6C786C30F2A5DCE00053681 /* profuse_file.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {796, 1988}}"; - sepNavSelRange = "{502, 0}"; - sepNavVisRange = "{1178, 692}"; + sepNavIntBoundsRect = "{{0, 0}, {1198, 1781}}"; + sepNavSelRange = "{1753, 0}"; + sepNavVisRange = "{1323, 1590}"; }; }; B6C786E50F2A5FF300053681 /* PBXTextBookmark */ = { @@ -631,26 +541,6 @@ vrLen = 330; vrLoc = 441; }; - B6C786E90F2A5FF300053681 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B6C786B30F2A59AF00053681 /* profuse.h */; - name = "profuse.h: 15"; - rLen = 0; - rLoc = 592; - rType = 0; - vrLen = 176; - vrLoc = 0; - }; - B6C786EA0F2A5FF300053681 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B6C786B40F2A59FE00053681 /* profuse_xattr.cpp */; - name = "profuse_xattr.cpp: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 360; - vrLoc = 0; - }; B6C786EE0F2A612600053681 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = B6B17F820F103AA70060F7AA /* fuse_common.h */; @@ -671,26 +561,6 @@ vrLen = 463; vrLoc = 500; }; - B6C786F20F2A612600053681 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B642F12A0F132FA3001F7696 /* UniversalDiskImage.cpp */; - name = "UniversalDiskImage.cpp: 42"; - rLen = 0; - rLoc = 820; - rType = 0; - vrLen = 463; - vrLoc = 500; - }; - B6C786F30F2A612600053681 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B6C786C30F2A5DCE00053681 /* profuse_file.cpp */; - name = "profuse_file.cpp: 11"; - rLen = 0; - rLoc = 132; - rType = 0; - vrLen = 365; - vrLoc = 0; - }; B6C786F70F2A64CC00053681 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = B6B17FA10F1138830060F7AA /* DiskCopy42.cpp */; @@ -701,16 +571,6 @@ vrLen = 333; vrLoc = 0; }; - B6C786F80F2A64CC00053681 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B6C786B40F2A59FE00053681 /* profuse_xattr.cpp */; - name = "profuse_xattr.cpp: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 371; - vrLoc = 3; - }; B6C786F90F2A64CC00053681 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = B6C786BF0F2A5CC000053681 /* profuse_stat.cpp */; @@ -731,16 +591,6 @@ vrLen = 365; vrLoc = 0; }; - B6C786FD0F2A64CC00053681 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B6C786BF0F2A5CC000053681 /* profuse_stat.cpp */; - name = "profuse_stat.cpp: 15"; - rLen = 0; - rLoc = 181; - rType = 0; - vrLen = 303; - vrLoc = 0; - }; B6D81E5B0EFDE859000219B7 /* xmain.cpp:163 */ = { isa = PBXFileBreakpoint; actions = ( @@ -756,8 +606,19 @@ lineNumber = 163; location = "ProDOS-Fuse"; modificationTime = 251949619.113805; + originalNumberOfMultipleMatches = 0; state = 2; }; + B6DA6C190FA6AFE90027FC1D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B60E91540EFB51FE000E4348 /* Disk.cpp */; + name = "Disk.cpp: 243"; + rLen = 0; + rLoc = 5390; + rType = 0; + vrLen = 1006; + vrLoc = 4914; + }; B6DBB4E70F0C6BBD00F385F2 /* profuse.1 */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {883, 1162}}"; @@ -796,14 +657,4 @@ vrLen = 368; vrLoc = 0; }; - B6F474110F2ACB4700CB75DA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B6C786BB0F2A5C0800053681 /* profuse_dirent.cpp */; - name = "profuse_dirent.cpp: 16"; - rLen = 0; - rLoc = 193; - rType = 0; - vrLen = 368; - vrLoc = 0; - }; } diff --git a/profuse.xcodeproj/project.pbxproj b/profuse.xcodeproj/project.pbxproj index 33e9c92..dac1c12 100644 --- a/profuse.xcodeproj/project.pbxproj +++ b/profuse.xcodeproj/project.pbxproj @@ -11,6 +11,7 @@ B60E91550EFB51FE000E4348 /* Disk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B60E91540EFB51FE000E4348 /* Disk.cpp */; }; B642F12B0F132FA3001F7696 /* UniversalDiskImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B642F12A0F132FA3001F7696 /* UniversalDiskImage.cpp */; }; B679E4A80F02E79300FB3F0C /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B679E4A70F02E79300FB3F0C /* main.cpp */; }; + B67F097910575F8300A13214 /* DateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B67F097810575F8300A13214 /* DateTime.cpp */; }; B6B17FA20F1138830060F7AA /* DiskCopy42.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6B17FA10F1138830060F7AA /* DiskCopy42.cpp */; }; B6C786B50F2A59FF00053681 /* profuse_xattr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6C786B40F2A59FE00053681 /* profuse_xattr.cpp */; }; B6C786BC0F2A5C0800053681 /* profuse_dirent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6C786BB0F2A5C0800053681 /* profuse_dirent.cpp */; }; @@ -40,6 +41,8 @@ B642F1290F132FA3001F7696 /* UniversalDiskImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniversalDiskImage.h; sourceTree = ""; }; B642F12A0F132FA3001F7696 /* UniversalDiskImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UniversalDiskImage.cpp; sourceTree = ""; }; B679E4A70F02E79300FB3F0C /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; + B67F097810575F8300A13214 /* DateTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateTime.cpp; sourceTree = ""; }; + B67F097A10575FD900A13214 /* DateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateTime.h; sourceTree = ""; }; B6B17FA00F1138830060F7AA /* DiskCopy42.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiskCopy42.h; sourceTree = ""; }; B6B17FA10F1138830060F7AA /* DiskCopy42.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DiskCopy42.cpp; sourceTree = ""; }; B6C786B30F2A59AF00053681 /* profuse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = profuse.h; sourceTree = ""; }; @@ -75,6 +78,8 @@ 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( + B67F097810575F8300A13214 /* DateTime.cpp */, + B67F097A10575FD900A13214 /* DateTime.h */, B642F1290F132FA3001F7696 /* UniversalDiskImage.h */, B642F12A0F132FA3001F7696 /* UniversalDiskImage.cpp */, B60E91580EFD77E3000E4348 /* common.h */, @@ -169,6 +174,7 @@ B6C786BC0F2A5C0800053681 /* profuse_dirent.cpp in Sources */, B6C786C00F2A5CC000053681 /* profuse_stat.cpp in Sources */, B6C786C40F2A5DCE00053681 /* profuse_file.cpp in Sources */, + B67F097910575F8300A13214 /* DateTime.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -286,6 +292,51 @@ }; name = "Debug Universal"; }; + B67F09801057600400A13214 /* Debug 10.6 */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ""; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = /usr/local/include/fuse; + ONLY_ACTIVE_ARCH = NO; + OTHER_CFLAGS = ( + "-D__FreeBSD__=10", + "-D_FILE_OFFSET_BITS=64", + "-D__DARWIN_64_BIT_INO_T=1", + "-DHAVE_STAT_BIRTHTIME", + ); + OTHER_LDFLAGS = ( + "-L/usr/local/lib/", + "-lfuse_ino64", + ); + PREBINDING = NO; + SDKROOT = macosx10.6; + VALID_ARCHS = "i386 x86_64"; + }; + name = "Debug 10.6"; + }; + B67F09811057600400A13214 /* Debug 10.6 */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "_GLIBCXX_DEBUG=1", + "_GLIBCXX_DEBUG_PEDANTIC=1", + ); + INSTALL_PATH = /usr/local/bin; + PRODUCT_NAME = profuse; + }; + name = "Debug 10.6"; + }; B6B767C10F0FF90400D819C9 /* Debug Universal 10.4 */ = { isa = XCBuildConfiguration; buildSettings = { @@ -335,6 +386,7 @@ isa = XCConfigurationList; buildConfigurations = ( 1DEB923208733DC60010E9CD /* Debug */, + B67F09811057600400A13214 /* Debug 10.6 */, B618461B0F0AF6CC0045CCF7 /* Debug Universal */, B6B767C20F0FF90400D819C9 /* Debug Universal 10.4 */, 1DEB923308733DC60010E9CD /* Release */, @@ -346,6 +398,7 @@ isa = XCConfigurationList; buildConfigurations = ( 1DEB923608733DC60010E9CD /* Debug */, + B67F09801057600400A13214 /* Debug 10.6 */, B618461A0F0AF6CC0045CCF7 /* Debug Universal */, B6B767C10F0FF90400D819C9 /* Debug Universal 10.4 */, 1DEB923708733DC60010E9CD /* Release */, diff --git a/profuse_dirent.cpp b/profuse_dirent.cpp index 8ed3015..a124739 100644 --- a/profuse_dirent.cpp +++ b/profuse_dirent.cpp @@ -27,7 +27,7 @@ using std::vector; */ void prodos_opendir(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi) { - fprintf(stderr, "opendir: %u\n", ino); + fprintf(stderr, "opendir: %u\n", (unsigned)ino); // verify it's a directory/volume here? @@ -72,7 +72,7 @@ void prodos_opendir(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi) void prodos_releasedir(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi) { - fprintf(stderr,"releasedir: %d\n", ino); + fprintf(stderr,"releasedir: %u\n", (unsigned)ino); vector *files = (vector *)fi->fh; if (files) delete files; @@ -85,7 +85,7 @@ void prodos_readdir(fuse_req_t req, fuse_ino_t ino, size_t size, off_t off, stru vector *files = (vector *)fi->fh; struct stat st; - fprintf(stderr, "readdir %u %u %u\n", ino, size, off); + fprintf(stderr, "readdir %u %u %u\n", (unsigned)ino, (unsigned)size, (unsigned)off); // TODO -- add "." and ".." entries... diff --git a/profuse_file.cpp b/profuse_file.cpp index b1fbd9e..69d5125 100644 --- a/profuse_file.cpp +++ b/profuse_file.cpp @@ -15,7 +15,7 @@ void prodos_open(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi) { - fprintf(stderr, "open: %u\n", ino); + fprintf(stderr, "open: %u\n", (unsigned)ino); uint8_t buffer[BLOCK_SIZE]; @@ -70,7 +70,7 @@ void prodos_open(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi) void prodos_release(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi) { - fprintf(stderr, "release: %d\n", ino); + fprintf(stderr, "release: %u\n", (unsigned)ino); FileEntry *e = (FileEntry *)fi->fh; @@ -82,7 +82,7 @@ void prodos_release(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi) void prodos_read(fuse_req_t req, fuse_ino_t ino, size_t size, off_t off, struct fuse_file_info *fi) { - fprintf(stderr, "read: %u %u %u\n", ino, size, off); + fprintf(stderr, "read: %u %u %u\n", (unsigned)ino, (unsigned)size, (unsigned)off); FileEntry *e = (FileEntry *)fi->fh; diff --git a/profuse_stat.cpp b/profuse_stat.cpp index 1ee87a6..4cc9ccd 100644 --- a/profuse_stat.cpp +++ b/profuse_stat.cpp @@ -109,7 +109,7 @@ void prodos_getattr(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi) struct stat st; int ok; - fprintf(stderr, "get_attr %u\n", ino); + fprintf(stderr, "get_attr %u\n", (unsigned)ino); bzero(&st, sizeof(st)); @@ -162,7 +162,7 @@ void prodos_lookup(fuse_req_t req, fuse_ino_t parent, const char *name) vector files; - fprintf(stderr, "lookup: %d %s\n", parent, name); + fprintf(stderr, "lookup: %u %s\n", (unsigned)parent, name); ERROR(!validProdosName(name), ENOENT) diff --git a/profuse_xattr.cpp b/profuse_xattr.cpp index a5fa243..19aa539 100644 --- a/profuse_xattr.cpp +++ b/profuse_xattr.cpp @@ -375,7 +375,7 @@ else fuse_reply_xattr(req, 0); \ return; \ } - fprintf(stderr, "listxattr %u\n", ino); + fprintf(stderr, "listxattr %u\n", (unsigned)ino); uint8_t buffer[BLOCK_SIZE]; int ok; @@ -484,7 +484,7 @@ void prodos_getxattr(fuse_req_t req, fuse_ino_t ino, const char *name, size_t si #define NO_ATTRIBUTE EOPNOTSUPP #endif - fprintf(stderr, "getxattr: %u %s %u %u \n", ino, name, (int)size, (int)off); + fprintf(stderr, "getxattr: %u %s %u %u \n", (unsigned)ino, name, (unsigned)size, (unsigned)off); uint8_t buffer[BLOCK_SIZE];