PageRenderTime 58ms CodeModel.GetById 17ms RepoModel.GetById 0ms app.codeStats 1ms

/packages/sysutils/diskdev_cmds/patches/diskdev_cmds-332.14-main.patch

http://github.com/OpenELEC/OpenELEC.tv
Patch | 2713 lines | 2554 code | 159 blank | 0 comment | 0 complexity | 26a2fbca3cb0cb14e8109b25084f81d1 MD5 | raw file
Possible License(s): CC0-1.0 
    

  1. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/cache.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/cache.c
    2. 

  2. --- diskdev_cmds-332.14/fsck_hfs.tproj/cache.c	2006-02-20 22:45:15.000000000 +0100
    3. 

  3. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/cache.c	2008-07-01 22:30:11.000000000 +0200
    4. 

  4. @@ -26,7 +26,11 @@
    5. 

  5.  #include <stdlib.h>
    6. 

  6.  #include <sys/mman.h>
    7. 

  7.  #include <sys/stat.h>
    8. 

  8. +#if LINUX
    9. 

  9. +#include "missing.h"
    10. 

  10. +#else
    11. 

  11.  #include <sys/types.h>
    12. 

  12. +#endif /* __LINUX__ */
    13. 

  13.  #include <sys/uio.h>
    14. 

  14.  #include <unistd.h>
    15. 

  15.  #include <string.h>
    16. 

  16. Files diskdev_cmds-332.14/fsck_hfs.tproj/cache.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/cache.o differ
    17. 

  17. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/BlockCache.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/BlockCache.c
    18. 

  18. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/BlockCache.c	2006-02-20 22:45:15.000000000 +0100
    19. 

  19. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/BlockCache.c	2008-07-01 22:30:11.000000000 +0200
    20. 

  20. @@ -20,6 +20,9 @@
    21. 

  21.   * @APPLE_LICENSE_HEADER_END@
    22. 

  22.   */
    23. 

  23.  
    24. 

  24. +#if LINUX
    25. 

  25. +#include "missing.h"
    26. 

  26. +#endif
    27. 

  27.  #include "SRuntime.h"
    28. 

  28.  #include "Scavenger.h"
    29. 

  29.  #include "../cache.h"
    30. 

  30. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/BlockCache.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/BlockCache.o differ
    31. 

  31. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/BTreeAllocate.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/BTreeAllocate.o differ
    32. 

  32. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/BTree.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/BTree.c
    33. 

  33. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/BTree.c	2006-02-20 22:45:15.000000000 +0100
    34. 

  34. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/BTree.c	2008-07-01 22:30:11.000000000 +0200
    35. 

  35. @@ -1705,7 +1705,9 @@
    36. 

  36.  								 UInt16					 version,
    37. 

  37.  								 BTreeInfoRec			*info )
    38. 

  38.  {
    39. 

  39. +#if !LINUX
    40. 

  40.  #pragma unused (version)
    41. 

  41. +#endif
    42. 

  42.  
    43. 

  43.  	BTreeControlBlockPtr	btreePtr;
    44. 

  44.  
    45. 

  45. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/BTreeMiscOps.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/BTreeMiscOps.o differ
    46. 

  46. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/BTreeNodeOps.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/BTreeNodeOps.o differ
    47. 

  47. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/BTree.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/BTree.o differ
    48. 

  48. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/BTreeScanner.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/BTreeScanner.o differ
    49. 

  49. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/BTreeTreeOps.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/BTreeTreeOps.c
    50. 

  50. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/BTreeTreeOps.c	2006-02-20 22:45:15.000000000 +0100
    51. 

  51. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/BTreeTreeOps.c	2008-07-01 22:30:11.000000000 +0200
    52. 

  52. @@ -223,7 +223,7 @@
    53. 

  53.          //
    54. 

  54.          if (curNodeNum == 0)
    55. 

  55.          {
    56. 

  56. -//          Panic("\pSearchTree: curNodeNum is zero!");
    57. 

  57. +            Panic("SearchTree: curNodeNum is zero!");
    58. 

  58.              err = fsBTInvalidNodeErr;
    59. 

  59.              goto ErrorExit;
    60. 

  60.          }
    61. 

  61. @@ -433,7 +433,7 @@
    62. 

  62.  		M_ExitOnError (err);
    63. 

  63.  		
    64. 

  64.  		if ( DEBUG_BUILD && updateParent && newRoot )
    65. 

  65. -			DebugStr("\p InsertLevel: New root from primary key, update from secondary key...");
    66. 

  66. +			DebugStr("InsertLevel: New root from primary key, update from secondary key...");
    67. 

  67.  	}
    68. 

  68.  
    69. 

  69.  	//////////////////////// Update Parent(s) ///////////////////////////////
    70. 

  70. @@ -448,7 +448,7 @@
    71. 

  71.  		
    72. 

  72.  		secondaryKey = nil;
    73. 

  73.  		
    74. 

  74. -		PanicIf ( (level == btreePtr->treeDepth), "\p InsertLevel: unfinished insert!?");
    75. 

  75. +		PanicIf ( (level == btreePtr->treeDepth), "InsertLevel: unfinished insert!?");
    76. 

  76.  
    77. 

  77.  		++level;
    78. 

  78.  
    79. 

  79. @@ -456,7 +456,7 @@
    80. 

  80.  		index = treePathTable [level].index;
    81. 

  81.  		parentNodeNum = treePathTable [level].node;
    82. 

  82.  
    83. 

  83. -		PanicIf ( parentNodeNum == 0, "\p InsertLevel: parent node is zero!?");
    84. 

  84. +		PanicIf ( parentNodeNum == 0, "InsertLevel: parent node is zero!?");
    85. 

  85.  
    86. 

  86.  		err = GetNode (btreePtr, parentNodeNum, &parentNode);	// released as target node in next level up
    87. 

  87.  		M_ExitOnError (err);
    88. 

  88. @@ -470,7 +470,7 @@
    89. 

  89.  		{
    90. 

  90.  			//ее╩debug: check if ptr == targetNodeNum
    91. 

  91.  			GetRecordByIndex (btreePtr, parentNode.buffer, index, &keyPtr, &recPtr, &recSize);
    92. 

  92. -			PanicIf( (*(UInt32 *) recPtr) != targetNodeNum, "\p InsertLevel: parent ptr doesn't match target node!");
    93. 

  93. +			PanicIf( (*(UInt32 *) recPtr) != targetNodeNum, "InsertLevel: parent ptr doesn't match target node!");
    94. 

  94.  			
    95. 

  95.  			// need to delete and re-insert this parent key/ptr
    96. 

  96.  			// we delete it here and it gets re-inserted in the
    97. 

  97. @@ -532,7 +532,7 @@
    98. 

  98.  	(void) ReleaseNode (btreePtr, targetNode);
    99. 

  99.  	(void) ReleaseNode (btreePtr, &siblingNode);
    100. 

  100.  
    101. 

  101. -	Panic ("\p InsertLevel: an error occured!");
    102. 

  102. +	Panic ("InsertLevel: an error occured!");
    103. 

  103.  
    104. 

  104.  	return	err;
    105. 

  105.  
    106. 

  106. @@ -566,7 +566,7 @@
    107. 

  107.  
    108. 

  108.  	*rootSplit = false;
    109. 

  109.  	
    110. 

  110. -	PanicIf ( targetNode->buffer == siblingNode->buffer, "\p InsertNode: targetNode == siblingNode, huh?");
    111. 

  111. +	PanicIf ( targetNode->buffer == siblingNode->buffer, "InsertNode: targetNode == siblingNode, huh?");
    112. 

  112.  	
    113. 

  113.  	leftNodeNum = ((NodeDescPtr) targetNode->buffer)->bLink;
    114. 

  114.  	rightNodeNum = ((NodeDescPtr) targetNode->buffer)->fLink;
    115. 

  115. @@ -606,7 +606,7 @@
    116. 

  116.  	
    117. 

  117.  	if ( leftNodeNum > 0 )
    118. 

  118.  	{
    119. 

  119. -		PanicIf ( siblingNode->buffer != nil, "\p InsertNode: siblingNode already aquired!");
    120. 

  120. +		PanicIf ( siblingNode->buffer != nil, "InsertNode: siblingNode already aquired!");
    121. 

  121.  
    122. 

  122.  		if ( siblingNode->buffer == nil )
    123. 

  123.  		{
    124. 

  124. @@ -614,7 +614,7 @@
    125. 

  125.  			M_ExitOnError (err);
    126. 

  126.  		}
    127. 

  127.  
    128. 

  128. -		PanicIf ( ((NodeDescPtr) siblingNode->buffer)->fLink != nodeNum, "\p InsertNode, RotateLeft: invalid sibling link!" );
    129. 

  129. +		PanicIf ( ((NodeDescPtr) siblingNode->buffer)->fLink != nodeNum, "InsertNode, RotateLeft: invalid sibling link!" );
    130. 

  130.  
    131. 

  131.  		if ( !key->skipRotate )		// are rotates allowed?
    132. 

  132.  		{
    133. 

  133. @@ -703,7 +703,7 @@
    134. 

  134.  
    135. 

  135.  	targetNodeNum = treePathTable[level].node;
    136. 

  136.  	targetNodePtr = targetNode->buffer;
    137. 

  137. -	PanicIf (targetNodePtr == nil, "\pDeleteTree: targetNode has nil buffer!");
    138. 

  138. +	PanicIf (targetNodePtr == nil, "DeleteTree: targetNode has nil buffer!");
    139. 

  139.  
    140. 

  140.  	DeleteRecord (btreePtr, targetNodePtr, index);
    141. 

  141.  		
    142. 

  142. @@ -797,7 +797,7 @@
    143. 

  143.  			 
    144. 

  144.  			//ее╩debug: check if ptr == targetNodeNum
    145. 

  145.  			GetRecordByIndex (btreePtr, parentNode.buffer, index, &keyPtr, &recPtr, &recSize);
    146. 

  146. -			PanicIf( (*(UInt32 *) recPtr) != targetNodeNum, "\p DeleteTree: parent ptr doesn't match targetNodeNum!!");
    147. 

  147. +			PanicIf( (*(UInt32 *) recPtr) != targetNodeNum, " DeleteTree: parent ptr doesn't match targetNodeNum!!");
    148. 

  148.  			
    149. 

  149.  			// need to delete and re-insert this parent key/ptr
    150. 

  150.  			DeleteRecord (btreePtr, parentNode.buffer, index);
    151. 

  151. @@ -1018,7 +1018,7 @@
    152. 

  152.  										keyPtr, keyLength, recPtr, recSize);
    153. 

  153.  			if ( !didItFit )
    154. 

  154.  			{
    155. 

  155. -				Panic ("\pRotateLeft: InsertKeyRecord (left) returned false!");
    156. 

  156. +				Panic ("RotateLeft: InsertKeyRecord (left) returned false!");
    157. 

  157.  				err = fsBTBadRotateErr;
    158. 

  158.  				goto ErrorExit;
    159. 

  159.  			}
    160. 

  160. @@ -1031,7 +1031,7 @@
    161. 

  161.  			didItFit = RotateRecordLeft (btreePtr, leftNode, rightNode);
    162. 

  162.  			if ( !didItFit )
    163. 

  163.  			{
    164. 

  164. -				Panic ("\pRotateLeft: RotateRecordLeft returned false!");
    165. 

  165. +				Panic ("RotateLeft: RotateRecordLeft returned false!");
    166. 

  166.  				err = fsBTBadRotateErr;
    167. 

  167.  				goto ErrorExit;
    168. 

  168.  			}
    169. 

  169. @@ -1048,7 +1048,7 @@
    170. 

  170.  									keyPtr, keyLength, recPtr, recSize);
    171. 

  171.  		if ( !didItFit )
    172. 

  172.  		{
    173. 

  173. -			Panic ("\pRotateLeft: InsertKeyRecord (right) returned false!");
    174. 

  174. +			Panic ("RotateLeft: InsertKeyRecord (right) returned false!");
    175. 

  175.  			err = fsBTBadRotateErr;
    176. 

  176.  			goto ErrorExit;
    177. 

  177.  		}
    178. 

  178. @@ -1117,7 +1117,7 @@
    179. 

  179.  	right = rightNode->buffer;
    180. 

  180.  	left  = leftNode->buffer;
    181. 

  181.  	
    182. 

  182. -	PanicIf ( right->bLink != 0 && left == 0, "\p SplitLeft: left sibling missing!?" );
    183. 

  183. +	PanicIf ( right->bLink != 0 && left == 0, " SplitLeft: left sibling missing!?" );
    184. 

  184.  	
    185. 

  185.  	//ее type should be kLeafNode or kIndexNode
    186. 

  186.  	
    187. 

  187. @@ -1240,8 +1240,8 @@
    188. 

  188.  	Boolean				didItFit;
    189. 

  189.  	UInt16				keyLength;	
    190. 

  190.  	
    191. 

  191. -	PanicIf (leftNode == nil, "\pAddNewRootNode: leftNode == nil");
    192. 

  192. -	PanicIf (rightNode == nil, "\pAddNewRootNode: rightNode == nil");
    193. 

  193. +	PanicIf (leftNode == nil, "AddNewRootNode: leftNode == nil");
    194. 

  194. +	PanicIf (rightNode == nil, "AddNewRootNode: rightNode == nil");
    195. 

  195.  	
    196. 

  196.  	
    197. 

  197.  	/////////////////////// Initialize New Root Node ////////////////////////////
    198. 

  198. @@ -1264,7 +1264,7 @@
    199. 

  199.  	didItFit = InsertKeyRecord ( btreePtr, rootNode.buffer, 0, keyPtr, keyLength,
    200. 

  200.  								 (UInt8 *) &rightNode->bLink, 4 );
    201. 

  201.  
    202. 

  202. -	PanicIf ( !didItFit, "\pAddNewRootNode:InsertKeyRecord failed for left index record");
    203. 

  203. +	PanicIf ( !didItFit, "AddNewRootNode:InsertKeyRecord failed for left index record");
    204. 

  204.  
    205. 

  205.  
    206. 

  206.  	//////////////////// Insert Right Node Index Record /////////////////////////
    207. 

  207. @@ -1275,7 +1275,7 @@
    208. 

  208.  	didItFit = InsertKeyRecord ( btreePtr, rootNode.buffer, 1, keyPtr, keyLength,
    209. 

  209.  								 (UInt8 *) &leftNode->fLink, 4 );
    210. 

  210.  
    211. 

  211. -	PanicIf ( !didItFit, "\pAddNewRootNode:InsertKeyRecord failed for right index record");
    212. 

  212. +	PanicIf ( !didItFit, "AddNewRootNode:InsertKeyRecord failed for right index record");
    213. 

  213.  
    214. 

  214.  
    215. 

  215.  #if DEBUG_TREEOPS
    216. 

  216. @@ -1355,7 +1355,7 @@
    217. 

  217.  	}
    218. 

  218.  	rightPtr = rightNodePtr->buffer;
    219. 

  219.  	
    220. 

  220. -	PanicIf ( leftPtr->fLink != 0 && rightPtr == 0, "\p SplitRight: right sibling missing!?" );
    221. 

  221. +	PanicIf ( leftPtr->fLink != 0 && rightPtr == 0, "SplitRight: right sibling missing!?" );
    222. 

  222.  	
    223. 

  223.  	//ее type should be kLeafNode or kIndexNode
    224. 

  224.  	
    225. 

  225. @@ -1557,7 +1557,7 @@
    226. 

  226.  									keyPtr, keyLength, recPtr, recSize);
    227. 

  227.  		if ( !didItFit )
    228. 

  228.  		{
    229. 

  229. -			Panic ("\pRotateRight: InsertKeyRecord (left) returned false!");
    230. 

  230. +			Panic ("RotateRight: InsertKeyRecord (left) returned false!");
    231. 

  231.  			err = fsBTBadRotateErr;
    232. 

  232.  			goto ErrorExit;
    233. 

  233.  		}
    234. 

  234. @@ -1572,7 +1572,7 @@
    235. 

  235.  		didItFit = RotateRecordRight( btreePtr, leftNodePtr, rightNodePtr );
    236. 

  236.  		if ( !didItFit )
    237. 

  237.  		{
    238. 

  238. -			Panic ("\pRotateRight: RotateRecordRight returned false!");
    239. 

  239. +			Panic ("RotateRight: RotateRecordRight returned false!");
    240. 

  240.  			err = fsBTBadRotateErr;
    241. 

  241.  			goto ErrorExit;
    242. 

  242.  		}
    243. 

  243. @@ -1583,7 +1583,7 @@
    244. 

  244.  										keyPtr, keyLength, recPtr, recSize);
    245. 

  245.  			if ( !didItFit )
    246. 

  246.  			{
    247. 

  247. -				Panic ("\pRotateRight: InsertKeyRecord (left) returned false!");
    248. 

  248. +				Panic ("RotateRight: InsertKeyRecord (left) returned false!");
    249. 

  249.  				err = fsBTBadRotateErr;
    250. 

  250.  				goto ErrorExit;
    251. 

  251.  			}
    252. 

  252. @@ -1607,7 +1607,7 @@
    253. 

  253.  									keyPtr, keyLength, recPtr, recSize);
    254. 

  254.  		if ( !didItFit )
    255. 

  255.  		{
    256. 

  256. -			Panic ("\pRotateRight: InsertKeyRecord (right) returned false!");
    257. 

  257. +			Panic ("RotateRight: InsertKeyRecord (right) returned false!");
    258. 

  258.  			err = fsBTBadRotateErr;
    259. 

  259.  			goto ErrorExit;
    260. 

  260.  		}
    261. 

  261. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/BTreeTreeOps.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/BTreeTreeOps.o differ
    262. 

  262. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/CatalogCheck.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/CatalogCheck.o differ
    263. 

  263. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/HardLinkCheck.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/HardLinkCheck.o differ
    264. 

  264. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/hfs_endian.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/hfs_endian.c
    265. 

  265. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/hfs_endian.c	2006-02-20 22:45:15.000000000 +0100
    266. 

  266. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/hfs_endian.c	2008-07-02 00:10:48.000000000 +0200
    267. 

  267. @@ -31,7 +31,11 @@
    268. 

  268.  #include <sys/types.h>
    269. 

  269.  #include <sys/stat.h>
    270. 

  270.  
    271. 

  271. +#if LINUX
    272. 

  272. +#include "missing.h"
    273. 

  273. +#else
    274. 

  274.  #include <architecture/byte_order.h>
    275. 

  275. +#endif
    276. 

  276.  #include <hfs/hfs_format.h>
    277. 

  277.  
    278. 

  278.  #include "Scavenger.h"
    279. 

  279. @@ -194,7 +198,7 @@
    280. 

  280.      BTNodeDescriptor *srcDesc = src->buffer;
    281. 

  281.      BTreeControlBlockPtr btcb = fcb->fcbBtree;
    282. 

  282.      UInt16 *srcOffs = NULL;
    283. 

  283. -    UInt32 i;
    284. 

  284. +    int i;
    285. 

  285.      int error = 0;
    286. 

  286.  
    287. 

  287.  //			WriteError(fcb->fcbVolume->vcbGPtr, E_BadNode, fcb->fcbFileID, src->blockNum);
    288. 

  288. @@ -433,7 +437,7 @@
    289. 

  289.      BTNodeDescriptor *srcDesc = src->buffer;
    290. 

  290.      UInt16 *srcOffs = (UInt16 *)((char *)src->buffer + (src->blockSize - (srcDesc->numRecords * sizeof (UInt16))));
    291. 

  291.  	char *nextRecord;	/*  Points to start of record following current one */
    292. 

  292. -    UInt32 i;
    293. 

  293. +    int i;
    294. 

  294.      UInt32 j;
    295. 

  295.  
    296. 

  296.      if (fileID == kHFSExtentsFileID) {
    297. 

  297. @@ -559,7 +563,7 @@
    298. 

  298.              /* Make sure name length is consistent with key length */
    299. 

  299.              if (keyLength < sizeof(srcKey->parentID) + sizeof(srcKey->nodeName.length) +
    300. 

  300.                  srcKey->nodeName.length*sizeof(srcKey->nodeName.unicode[0])) {
    301. 

  301. -				if (debug) printf("hfs_swap_HFSPlusBTInternalNode: catalog record #%d keyLength=%d expected=%lu\n",
    302. 

  302. +				if (debug) printf("hfs_swap_HFSPlusBTInternalNode: catalog record #%d keyLength=%d expected=%i\n",
    303. 

  303.  					srcDesc->numRecords-i, keyLength, sizeof(srcKey->parentID) + sizeof(srcKey->nodeName.length) +
    304. 

  304.                      srcKey->nodeName.length*sizeof(srcKey->nodeName.unicode[0]));
    305. 

  305.  				WriteError(fcb->fcbVolume->vcbGPtr, E_KeyLen, fcb->fcbFileID, src->blockNum);
    306. 

  306. @@ -854,7 +858,7 @@
    307. 

  307.      UInt16 *srcOffs = (UInt16 *)((char *)src->buffer + (src->blockSize - (srcDesc->numRecords * sizeof (UInt16))));
    308. 

  308.  	char *nextRecord;	/*  Points to start of record following current one */
    309. 

  309.  
    310. 

  310. -    UInt32 i;
    311. 

  311. +    int i;
    312. 

  312.      UInt32 j;
    313. 

  313.  
    314. 

  314.      if (fileID == kHFSExtentsFileID) {
    315. 

  315. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/hfs_endian.h diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/hfs_endian.h
    316. 

  316. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/hfs_endian.h	2006-02-20 22:45:15.000000000 +0100
    317. 

  317. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/hfs_endian.h	2008-07-01 22:30:11.000000000 +0200
    318. 

  318. @@ -27,9 +27,14 @@
    319. 

  319.   *
    320. 

  320.   * This file prototypes endian swapping routines for the HFS/HFS Plus
    321. 

  321.   * volume format.
    322. 

  322. - */
    323. 

  323. +*/
    324. 

  324.  #include <hfs/hfs_format.h>
    325. 

  325. +#if LINUX
    326. 

  326. +#include <endian.h>
    327. 

  327. +#include <byteswap.h>
    328. 

  328. +#else
    329. 

  329.  #include <architecture/byte_order.h>
    330. 

  330. +#endif
    331. 

  331.  #include "SRuntime.h"
    332. 

  332.  
    333. 

  333.  /*********************/
    334. 

  334. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/hfs_endian.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/hfs_endian.o differ
    335. 

  335. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/libdfa.a and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/libdfa.a differ
    336. 

  336. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/Makefile.lnx diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/Makefile.lnx
    337. 

  337. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/Makefile.lnx	1970-01-01 01:00:00.000000000 +0100
    338. 

  338. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/Makefile.lnx	2008-07-01 22:30:11.000000000 +0200
    339. 

  339. @@ -0,0 +1,15 @@
    340. 

  340. +CFILES = hfs_endian.c BlockCache.c\
    341. 

  341. +         BTree.c BTreeAllocate.c BTreeMiscOps.c \
    342. 

  342. +         BTreeNodeOps.c BTreeScanner.c BTreeTreeOps.c\
    343. 

  343. +         CatalogCheck.c HardLinkCheck.c\
    344. 

  344. +         SBTree.c SControl.c SVerify1.c SVerify2.c\
    345. 

  345. +         SRepair.c SRebuildCatalogBTree.c\
    346. 

  346. +         SUtils.c SKeyCompare.c SDevice.c SExtents.c SAllocate.c\
    347. 

  347. +         SCatalog.c SStubs.c VolumeBitmapCheck.c
    348. 

  348. +OFILES = $(CFILES:.c=.o)
    349. 

  349. +
    350. 

  350. +libdfa.a: $(OFILES)
    351. 

  351. +	$(AR) rc $@ $?
    352. 

  352. +
    353. 

  353. +clean:
    354. 

  354. +	$(RM) $(OFILES) libdfa.a
    355. 

  355. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SAllocate.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SAllocate.o differ
    356. 

  356. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SBTree.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SBTree.c
    357. 

  357. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SBTree.c	2006-02-20 22:45:15.000000000 +0100
    358. 

  358. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SBTree.c	2008-07-01 22:30:11.000000000 +0200
    359. 

  359. @@ -93,7 +93,7 @@
    360. 

  360.  			CopyMemory(&resultIterator->key, foundKey, CalcKeySize(btcb, &resultIterator->key));	//ее warning, this could overflow user's buffer!!!
    361. 

  361.  
    362. 

  362.  		if ( DEBUG_BUILD && !ValidHFSRecord(data, btcb, *dataSize) )
    363. 

  363. -			DebugStr("\pSearchBTreeRecord: bad record?");
    364. 

  364. +			DebugStr("SearchBTreeRecord: bad record?");
    365. 

  365.  	}
    366. 

  366.  
    367. 

  367.  ErrorExit:
    368. 

  368. @@ -190,7 +190,7 @@
    369. 

  369.  		CopyMemory(&iterator->key, key, CalcKeySize(btcb, &iterator->key));	//ее warning, this could overflow user's buffer!!!
    370. 

  370.  		
    371. 

  371.  		if ( DEBUG_BUILD && !ValidHFSRecord(data, btcb, *dataSize) )
    372. 

  372. -			DebugStr("\pGetBTreeRecord: bad record?");
    373. 

  373. +			DebugStr("GetBTreeRecord: bad record?");
    374. 

  374.  
    375. 

  375.  	}
    376. 

  376.  	
    377. 

  377. @@ -222,7 +222,7 @@
    378. 

  378.  	CopyMemory(key, &iterator.key, CalcKeySize(btcb, (BTreeKey *) key));	//ее should we range check against maxkeylen?
    379. 

  379.  
    380. 

  380.  	if ( DEBUG_BUILD && !ValidHFSRecord(data, btcb, dataSize) )
    381. 

  381. -		DebugStr("\pInsertBTreeRecord: bad record?");
    382. 

  382. +		DebugStr("InsertBTreeRecord: bad record?");
    383. 

  383.  
    384. 

  384.  	result = BTInsertRecord( fcb, &iterator, &btRecord, dataSize );
    385. 

  385.  
    386. 

  386. @@ -284,7 +284,7 @@
    387. 

  387.  	CopyMemory(key, &iterator.key, CalcKeySize(btcb, (BTreeKey *) key));		//ее should we range check against maxkeylen?
    388. 

  388.  
    389. 

  389.  	if ( DEBUG_BUILD && !ValidHFSRecord(newData, btcb, dataSize) )
    390. 

  390. -		DebugStr("\pReplaceBTreeRecord: bad record?");
    391. 

  391. +		DebugStr("ReplaceBTreeRecord: bad record?");
    392. 

  392.  
    393. 

  393.  	result = BTReplaceRecord( fcb, &iterator, &btRecord, dataSize );
    394. 

  394.  
    395. 

  395. @@ -301,7 +301,9 @@
    396. 

  396.  OSStatus
    397. 

  397.  SetEndOfForkProc ( SFCB *filePtr, FSSize minEOF, FSSize maxEOF )
    398. 

  398.  {
    399. 

  399. +#if !LINUX
    400. 

  400.  #pragma unused (maxEOF)
    401. 

  401. +#endif
    402. 

  402.  
    403. 

  403.  	OSStatus	result;
    404. 

  404.  	UInt32		actualSectorsAdded;
    405. 

  405. @@ -321,7 +323,7 @@
    406. 

  406.  	else
    407. 

  407.  	{
    408. 

  408.  		if ( DEBUG_BUILD )
    409. 

  409. -			DebugStr("\pSetEndOfForkProc: minEOF is smaller than current size!");
    410. 

  410. +			DebugStr("SetEndOfForkProc: minEOF is smaller than current size!");
    411. 

  411.  		return -1;
    412. 

  412.  	}
    413. 

  413.  
    414. 

  414. @@ -347,7 +349,7 @@
    415. 

  415.  	//	Make sure we got at least as much space as we needed
    416. 

  416.  	//
    417. 

  417.  	if (filePtr->fcbLogicalSize < minEOF) {
    418. 

  418. -		Panic("\pSetEndOfForkProc: disk too full to extend B-tree file");
    419. 

  419. +		Panic("SetEndOfForkProc: disk too full to extend B-tree file");
    420. 

  420.  		return dskFulErr;
    421. 

  421.  	}
    422. 

  422.  	
    423. 

  423. @@ -419,7 +421,7 @@
    424. 

  424.  	if ( (keyLen < 6) || (keyLen > btcb->maxKeyLength) )
    425. 

  425.  	{
    426. 

  426.  		if ( DEBUG_BUILD )
    427. 

  427. -			DebugStr("\pCheckBTreeKey: bad key length!");
    428. 

  428. +			DebugStr("CheckBTreeKey: bad key length!");
    429. 

  429.  		return fsBTInvalidKeyLengthErr;
    430. 

  430.  	}
    431. 

  431.  	
    432. 

  432. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SBTree.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SBTree.o differ
    433. 

  433. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SCatalog.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SCatalog.o differ
    434. 

  434. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/Scavenger.h diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/Scavenger.h
    435. 

  435. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/Scavenger.h	2006-02-20 22:45:15.000000000 +0100
    436. 

  436. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/Scavenger.h	2008-07-01 22:30:11.000000000 +0200
    437. 

  437. @@ -35,11 +35,16 @@
    438. 

  438.  #include "BTreeScanner.h"
    439. 

  439.  #include "hfs_endian.h"
    440. 

  440.  
    441. 

  441. +#if LINUX
    442. 

  442. +#define XATTR_MAXNAMELEN 127
    443. 

  443. +#include <limits.h>
    444. 

  444. +#else
    445. 

  445.  #include <sys/xattr.h>
    446. 

  446.  #include <sys/acl.h>
    447. 

  447.  #include <sys/kauth.h>
    448. 

  448. -#include <sys/errno.h>
    449. 

  449.  #include <sys/syslimits.h>
    450. 

  450. +#endif
    451. 

  451. +#include <sys/errno.h>
    452. 

  452.  
    453. 

  453.  #ifdef __cplusplus
    454. 

  454.  extern	"C" {
    455. 

  455. @@ -1434,4 +1439,8 @@
    456. 

  456.  };
    457. 

  457.  #endif
    458. 

  458.  
    459. 

  459. +#if LINUX
    460. 

  460. +#undef XATTR_MAXNAMELEN
    461. 

  461. +#endif
    462. 

  462. +
    463. 

  463.  #endif /* __SCAVENGER__ */
    464. 

  464. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SControl.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SControl.c
    465. 

  465. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SControl.c	2006-02-20 22:45:15.000000000 +0100
    466. 

  466. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SControl.c	2008-07-01 22:30:11.000000000 +0200
    467. 

  467. @@ -739,7 +739,7 @@
    468. 

  468.  		pointer = (ScavStaticStructures *) AllocateClearMemory( sizeof(ScavStaticStructures) );
    469. 

  469.  		if ( pointer == nil ) {
    470. 

  470.  			if ( GPtr->logLevel >= kDebugLog ) {
    471. 

  471. -				printf( "\t error %d - could not allocate %ld bytes of memory \n",
    472. 

  472. +				printf( "\t error %d - could not allocate %i bytes of memory \n",
    473. 

  473.  					R_NoMem, sizeof(ScavStaticStructures) );
    474. 

  474.  			}
    475. 

  475.  			return( R_NoMem );
    476. 

  476. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SControl.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SControl.o differ
    477. 

  477. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SDevice.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SDevice.c
    478. 

  478. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SDevice.c	2006-02-20 22:45:15.000000000 +0100
    479. 

  479. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SDevice.c	2008-07-01 22:30:11.000000000 +0200
    480. 

  480. @@ -28,24 +28,61 @@
    481. 

  481.  #include <unistd.h>
    482. 

  482.  #include <errno.h>
    483. 

  483.  #include <sys/ioctl.h>
    484. 

  484. -
    485. 

  485. +#if LINUX
    486. 

  486. +#include <fcntl.h>
    487. 

  487. +#include <sys/stat.h>
    488. 

  488. +#else
    489. 

  489.  #include <IOKit/storage/IOMediaBSDClient.h>
    490. 

  490. -
    491. 

  491. +#endif /* LINUX */
    492. 

  492.  #else
    493. 

  493. -
    494. 

  494.  #include <Files.h>
    495. 

  495.  #include <Device.h>
    496. 

  496.  #include <Disks.h>
    497. 

  497.  
    498. 

  498. -#endif
    499. 

  499. -
    500. 

  500. +#endif 
    501. 

  501.  
    502. 

  502.  OSErr GetDeviceSize(int driveRefNum, UInt64 *numBlocks, UInt32 *blockSize)
    503. 

  503.  {
    504. 

  504.  #if BSD
    505. 

  505.  	UInt64 devBlockCount = 0;
    506. 

  506.  	int devBlockSize = 0;
    507. 

  507. +#if LINUX
    508. 

  508. +	struct stat stbuf;
    509. 

  509. +
    510. 

  510. +	devBlockSize = 512;
    511. 

  511.  
    512. 

  512. +#ifndef BLKGETSIZE
    513. 

  513. +#define BLKGETSIZE              _IO(0x12,96)
    514. 

  514. +#endif
    515. 

  515. +#ifndef BLKGETSIZE64
    516. 

  516. +#define BLKGETSIZE64            _IOR(0x12,114,size_t)
    517. 

  517. +#endif
    518. 

  518. +	if (fstat(driveRefNum, &stbuf) < 0){
    519. 

  519. +		printf("Error: %s\n", strerror(errno));
    520. 

  520. +		return(-1);
    521. 

  521. +	}
    522. 

  522. +        
    523. 

  523. +        if (S_ISREG(stbuf.st_mode)) {
    524. 

  524. +                devBlockCount = stbuf.st_size / 512;
    525. 

  525. +        } 
    526. 

  526. +        else if (S_ISBLK(stbuf.st_mode)) {
    527. 

  527. +                unsigned long size;
    528. 

  528. +                u_int64_t size64;
    529. 

  529. +                if (!ioctl(driveRefNum, BLKGETSIZE64, &size64))
    530. 

  530. +                        devBlockCount = size64 / 512;
    531. 

  531. +                else if (!ioctl(driveRefNum, BLKGETSIZE, &size))
    532. 

  532. +                        devBlockCount = size;
    533. 

  533. +                else{
    534. 

  534. +                        printf("Error: %s\n", strerror(errno));
    535. 

  535. +			return(-1);
    536. 

  536. +		}
    537. 

  537. +			
    538. 

  538. +        }
    539. 

  539. +        else{
    540. 

  540. +                printf("Device is not a block device");
    541. 

  541. +		return(-1);
    542. 

  542. +	}
    543. 

  543. +#elif BSD
    544. 

  544.  	if (ioctl(driveRefNum, DKIOCGETBLOCKCOUNT, &devBlockCount) < 0) {
    545. 

  545.  		printf("ioctl(DKIOCGETBLOCKCOUNT) for fd %d: %s\n", driveRefNum, strerror(errno));
    546. 

  546.  		return (-1);
    547. 

  547. @@ -55,6 +92,7 @@
    548. 

  548.  		printf("ioctl(DKIOCGETBLOCKSIZE) for fd %d: %s\n", driveRefNum, strerror(errno));
    549. 

  549.  		return (-1);
    550. 

  550.  	}
    551. 

  551. +#endif /* BSD */
    552. 

  552.  
    553. 

  553.  	if (devBlockSize != 512) {
    554. 

  554.  		*numBlocks = (devBlockCount * (UInt64)devBlockSize) / 512;
    555. 

  555. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SDevice.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SDevice.o differ
    556. 

  556. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SExtents.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SExtents.o differ
    557. 

  557. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SKeyCompare.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SKeyCompare.c
    558. 

  558. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SKeyCompare.c	2006-02-20 22:45:15.000000000 +0100
    559. 

  559. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SKeyCompare.c	2008-07-01 22:30:11.000000000 +0200
    560. 

  560. @@ -454,7 +454,9 @@
    561. 

  561.   * The name portion of the key is compared using a 16-bit binary comparison. 
    562. 

  562.   * This is called from the b-tree code.
    563. 

  563.   */
    564. 

  564. +#if !LINUX
    565. 

  565.  __private_extern__
    566. 

  566. +#endif
    567. 

  567.  SInt32
    568. 

  568.  CompareAttributeKeys(const AttributeKey *searchKey, const AttributeKey *trialKey)
    569. 

  569.  {
    570. 

  570. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SKeyCompare.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SKeyCompare.o differ
    571. 

  571. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SRebuildCatalogBTree.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SRebuildCatalogBTree.o differ
    572. 

  572. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SRepair.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SRepair.c
    573. 

  573. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SRepair.c	2006-02-20 22:45:15.000000000 +0100
    574. 

  574. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SRepair.c	2008-07-01 22:30:11.000000000 +0200
    575. 

  575. @@ -1593,7 +1593,9 @@
    576. 

  576.  
    577. 

  577.  static	OSErr	FixWrapperExtents( SGlobPtr GPtr, RepairOrderPtr p )
    578. 

  578.  {
    579. 

  579. +#if !LINUX
    580. 

  580.  #pragma unused (p)
    581. 

  581. +#endif
    582. 

  582.  
    583. 

  583.  	OSErr						err;
    584. 

  584.  	HFSMasterDirectoryBlock		*mdb;
    585. 

  585. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SRepair.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SRepair.o differ
    586. 

  586. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SRuntime.h diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SRuntime.h
    587. 

  587. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SRuntime.h	2006-02-20 22:45:15.000000000 +0100
    588. 

  588. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SRuntime.h	2008-07-01 22:30:11.000000000 +0200
    589. 

  589. @@ -27,8 +27,11 @@
    590. 

  590.  #define __SRUNTIME__
    591. 

  591.  
    592. 

  592.  #if BSD
    593. 

  593. -
    594. 

  594. +#if LINUX
    595. 

  595. +#include "missing.h"
    596. 

  596. +#else
    597. 

  597.  #include <sys/types.h>
    598. 

  598. +#endif
    599. 

  599.  #include <stdlib.h>
    600. 

  600.  #include <string.h>
    601. 

  601.  #include <stdio.h>
    602. 

  602. @@ -91,10 +94,12 @@
    603. 

  603.  
    604. 

  604.  typedef u_int32_t	HFSCatalogNodeID;
    605. 

  605.  
    606. 

  606. +#if !LINUX
    607. 

  607.  enum {
    608. 

  608.  	false		= 0,
    609. 

  609.  	true		= 1
    610. 

  610.  };
    611. 

  611. +#endif
    612. 

  612.  
    613. 

  613.  /* OS error codes */
    614. 

  614.  enum {
    615. 

  615. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SStubs.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SStubs.o differ
    616. 

  616. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SUtils.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SUtils.c
    617. 

  617. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SUtils.c	2006-02-20 22:45:15.000000000 +0100
    618. 

  618. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SUtils.c	2008-07-01 22:30:11.000000000 +0200
    619. 

  619. @@ -380,7 +380,8 @@
    620. 

  620.  //				GPtr->realVCB			Real in-memory vcb
    621. 

  621.  //------------------------------------------------------------------------------
    622. 

  622.  
    623. 

  623. -#if !BSD	
    624. 

  624. +#if BSD
    625. 

  625. +#if !LINUX
    626. 

  626.  OSErr GetVolumeFeatures( SGlobPtr GPtr )
    627. 

  627.  {
    628. 

  628.  	OSErr					err;
    629. 

  629. @@ -418,7 +419,7 @@
    630. 

  630.  	return( noErr );
    631. 

  631.  }
    632. 

  632.  #endif
    633. 

  633. -
    634. 

  634. +#endif
    635. 

  635.  
    636. 

  636.  
    637. 

  637.  /*-------------------------------------------------------------------------------
    638. 

  638. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SUtils.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SUtils.o differ
    639. 

  639. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SVerify1.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SVerify1.o differ
    640. 

  640. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SVerify2.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SVerify2.c
    641. 

  641. --- diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SVerify2.c	2006-02-20 22:45:15.000000000 +0100
    642. 

  642. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SVerify2.c	2008-07-01 22:30:11.000000000 +0200
    643. 

  643. @@ -32,7 +32,9 @@
    644. 

  644.  */
    645. 

  645.  
    646. 

  646.  #include <sys/ioctl.h>
    647. 

  647. +#if !LINUX
    648. 

  648.  #include <sys/disk.h>
    649. 

  649. +#endif
    650. 

  650.  
    651. 

  651.  #include "BTree.h"
    652. 

  652.  #include "BTreePrivate.h"
    653. 

  653. @@ -1240,8 +1242,13 @@
    654. 

  654.  	 * clump size for read-only media is irrelevant we skip the clump size 
    655. 

  655.  	 * check to avoid non useful warnings. 
    656. 

  656.  	 */
    657. 

  657. +#if LINUX
    658. 

  658. +	// FIXME
    659. 

  659. +	isWriteable = 1;
    660. 

  660. +#else
    661. 

  661.  	isWriteable = 0;
    662. 

  662.  	ioctl( GPtr->DrvNum, DKIOCISWRITABLE, &isWriteable );
    663. 

  663. +#endif
    664. 

  664.  	if ( isWriteable != 0 && 
    665. 

  665.  		 volumeHeader->catalogFile.clumpSize != vcb->vcbCatalogFile->fcbClumpSize ) {
    666. 

  666.  		PrintError(GPtr, E_InvalidClumpSize, 0);
    667. 

  667. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/SVerify2.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/SVerify2.o differ
    668. 

  668. Files diskdev_cmds-332.14/fsck_hfs.tproj/dfalib/VolumeBitmapCheck.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/dfalib/VolumeBitmapCheck.o differ
    669. 

  669. Files diskdev_cmds-332.14/fsck_hfs.tproj/fsck_hfs and diskdev_cmds-332.14-patched/fsck_hfs.tproj/fsck_hfs differ
    670. 

  670. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/fsck_hfs.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/fsck_hfs.c
    671. 

  671. --- diskdev_cmds-332.14/fsck_hfs.tproj/fsck_hfs.c	2006-02-20 22:45:15.000000000 +0100
    672. 

  672. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/fsck_hfs.c	2008-07-01 22:36:12.000000000 +0200
    673. 

  673. @@ -24,10 +24,14 @@
    674. 

  674.  #include <sys/types.h>
    675. 

  675.  #include <sys/stat.h>
    676. 

  676.  #include <sys/param.h>
    677. 

  677. +#if !LINUX
    678. 

  678.  #include <sys/ucred.h>
    679. 

  679. +#endif
    680. 

  680.  #include <sys/mount.h>
    681. 

  681.  #include <sys/ioctl.h>
    682. 

  682. +#if !LINUX
    683. 

  683.  #include <sys/disk.h>
    684. 

  684. +#endif
    685. 

  685.  
    686. 

  686.  #include <hfs/hfs_mount.h>
    687. 

  687.  
    688. 

  688. @@ -105,7 +109,7 @@
    689. 

  689.  	else
    690. 

  690.  		progname = *argv;
    691. 

  691.  
    692. 

  692. -	while ((ch = getopt(argc, argv, "dfglm:npqruy")) != EOF) {
    693. 

  693. +	while ((ch = getopt(argc, argv, "dfglm:napqruy")) != EOF) {
    694. 

  694.  		switch (ch) {
    695. 

  695.  		case 'd':
    696. 

  696.  			debug++;
    697. 

  697. @@ -141,6 +145,7 @@
    698. 

  698.  			yflag = 0;
    699. 

  699.  			break;
    700. 

  700.  
    701. 

  701. +		case 'a':
    702. 

  702.  		case 'p':
    703. 

  703.  			preen++;
    704. 

  704.  			break;
    705. 

  705. @@ -170,10 +175,12 @@
    706. 

  706.  	
    707. 

  707.  	if (guiControl)
    708. 

  708.  		debug = 0; /* debugging is for command line only */
    709. 

  709. -
    710. 

  710. +#if LINUX
    711. 

  711. +// FIXME
    712. 

  712. +#else
    713. 

  713.  	if (signal(SIGINT, SIG_IGN) != SIG_IGN)
    714. 

  714.  		(void)signal(SIGINT, catch);
    715. 

  715. -
    716. 

  716. +#endif
    717. 

  717.  	if (argc < 1) {
    718. 

  718.  		(void) fprintf(stderr, "%s: missing special-device\n", progname);
    719. 

  719.  		usage();
    720. 

  720. @@ -194,7 +201,9 @@
    721. 

  721.  	int chkLev, repLev, logLev;
    722. 

  722.  	int blockDevice_fd, canWrite;
    723. 

  723.  	char *unraw, *mntonname;
    724. 

  724. +#if !LINUX
    725. 

  725.  	struct statfs *fsinfo;
    726. 

  726. +#endif
    727. 

  727.  	int fs_fd=-1;  // fd to the root-dir of the fs we're checking (only w/lfag == 1)
    728. 

  728.  
    729. 

  729.  	flags = 0;
    730. 

  730. @@ -203,7 +212,9 @@
    731. 

  731.  	canWrite = 0;
    732. 

  732.  	unraw = NULL;
    733. 

  733.  	mntonname = NULL;
    734. 

  734. -
    735. 

  735. +#if LINUX
    736. 

  736. +	// FIXME
    737. 

  737. +#else
    738. 

  738.  	if (lflag) {
    739. 

  739.  		result = getmntinfo(&fsinfo, MNT_NOWAIT);
    740. 

  740.  
    741. 

  741. @@ -233,7 +244,7 @@
    742. 

  742.  		    }
    743. 

  743.  		}
    744. 

  744.  	}
    745. 

  745. -
    746. 

  746. +#endif
    747. 

  747.  	if (debug && preen)
    748. 

  748.  		pwarn("starting\n");
    749. 

  749.  	
    750. 

  750. @@ -306,6 +317,9 @@
    751. 

  751.  			}
    752. 

  752.  		}
    753. 

  753.  	} else {
    754. 

  754. +#if LINUX
    755. 

  755. +	// FIXME
    756. 

  756. +#else
    757. 

  757.  		struct statfs stfs_buf;
    758. 

  758.  		/*
    759. 

  759.  		 * Check to see if root is mounted read-write.
    760. 

  760. @@ -315,18 +329,24 @@
    761. 

  761.  		else
    762. 

  762.  			flags = 0;
    763. 

  763.  		ckfini(flags & MNT_RDONLY);
    764. 

  764. +#endif
    765. 

  765.  	}
    766. 

  766.  
    767. 

  767.  	/* XXX free any allocated memory here */
    768. 

  768.  
    769. 

  769.  	if (hotroot && fsmodified) {
    770. 

  770. +#if !LINUX
    771. 

  771.  		struct hfs_mount_args args;
    772. 

  772. +#endif
    773. 

  773.  		/*
    774. 

  774.  		 * We modified the root.  Do a mount update on
    775. 

  775.  		 * it, unless it is read-write, so we can continue.
    776. 

  776.  		 */
    777. 

  777.  		if (!preen)
    778. 

  778.  			printf("\n***** FILE SYSTEM WAS MODIFIED *****\n");
    779. 

  779. +#if LINUX
    780. 

  780. +		// FIXME
    781. 

  781. +#else
    782. 

  782.  		if (flags & MNT_RDONLY) {		
    783. 

  783.  			bzero(&args, sizeof(args));
    784. 

  784.  			flags |= MNT_UPDATE | MNT_RELOAD;
    785. 

  785. @@ -335,6 +355,7 @@
    786. 

  786.  				goto ExitThisRoutine;
    787. 

  787.  			}
    788. 

  788.  		}
    789. 

  789. +#endif
    790. 

  790.  		if (!preen)
    791. 

  791.  			printf("\n***** REBOOT NOW *****\n");
    792. 

  792.  		sync();
    793. 

  793. @@ -380,11 +401,13 @@
    794. 

  794.  		printf("Can't stat %s: %s\n", dev, strerror(errno));
    795. 

  795.  		return (0);
    796. 

  796.  	}
    797. 

  797. +#if !LINUX
    798. 

  798.  	if ((statb.st_mode & S_IFMT) != S_IFCHR) {
    799. 

  799.  		pfatal("%s is not a character device", dev);
    800. 

  800.  		if (reply("CONTINUE") == 0)
    801. 

  801.  			return (0);
    802. 

  802.  	}
    803. 

  803. +#endif
    804. 

  804.  	if ((fsreadfd = open(dev, O_RDONLY)) < 0) {
    805. 

  805.  		printf("Can't open %s: %s\n", dev, strerror(errno));
    806. 

  806.  		return (0);
    807. 

  807. @@ -407,10 +430,14 @@
    808. 

  808.  		printf("\n");
    809. 

  809.  
    810. 

  810.  	/* Get device block size to initialize cache */
    811. 

  811. +#if LINUX
    812. 

  812. +	devBlockSize = 512;
    813. 

  813. +#else
    814. 

  814.  	if (ioctl(fsreadfd, DKIOCGETBLOCKSIZE, &devBlockSize) < 0) {
    815. 

  815.  		pfatal ("Can't get device block size\n");
    816. 

  816.  		return (0);
    817. 

  817.  	}
    818. 

  818. +#endif
    819. 

  819.  	/* Initialize the cache */
    820. 

  820.  	if (CacheInit (&fscache, fsreadfd, fswritefd, devBlockSize,
    821. 

  821.  			CACHE_IOSIZE, CACHE_BLOCKS, CACHE_HASHSIZE) != EOK) {
    822. 

  822. @@ -431,11 +458,15 @@
    823. 

  823.  
    824. 

  824.  static void getWriteAccess( char *dev, int *blockDevice_fdPtr, int *canWritePtr )
    825. 

  825.  {
    826. 

  826. +#if !LINUX
    827. 

  827.  	int					i;
    828. 

  828.  	int					myMountsCount;
    829. 

  829. +#endif
    830. 

  830.  	void *				myPtr;
    831. 

  831.  	char *				myCharPtr;
    832. 

  832. +#if !LINUX
    833. 

  833.  	struct statfs *		myBufPtr;
    834. 

  834. +#endif
    835. 

  835.  	void *				myNamePtr;
    836. 

  836.  
    837. 

  837.  	myPtr = NULL;
    838. 

  838. @@ -456,18 +487,19 @@
    839. 

  839.  		*canWritePtr = 1;
    840. 

  840.  		goto ExitThisRoutine;
    841. 

  841.  	}
    842. 

  842. -	
    843. 

  843.  	// get count of mounts then get the info for each 
    844. 

  844. +#if LINUX
    845. 

  845. +	// FIXME
    846. 

  846. +#else
    847. 

  847.  	myMountsCount = getfsstat( NULL, 0, MNT_NOWAIT );
    848. 

  848.  	if ( myMountsCount < 0 )
    849. 

  849.  		goto ExitThisRoutine;
    850. 

  850. -
    851. 

  851.  	myPtr = (void *) malloc( sizeof(struct statfs) * myMountsCount );
    852. 

  852.  	if ( myPtr == NULL ) 
    853. 

  853.  		goto ExitThisRoutine;
    854. 

  854.  	myMountsCount = getfsstat( 	myPtr, 
    855. 

  855. -								(sizeof(struct statfs) * myMountsCount), 
    856. 

  856. -								MNT_NOWAIT );
    857. 

  857. +							(sizeof(struct statfs) * myMountsCount), 
    858. 

  858. +							MNT_NOWAIT );
    859. 

  859.  	if ( myMountsCount < 0 )
    860. 

  860.  		goto ExitThisRoutine;
    861. 

  861.  
    862. 

  862. @@ -481,8 +513,8 @@
    863. 

  863.  		}
    864. 

  864.  		myBufPtr++;
    865. 

  865.  	}
    866. 

  866. +#endif
    867. 

  867.  	*canWritePtr = 1;  // single user will get us here, f_mntfromname is not /dev/diskXXXX 
    868. 

  868. -	
    869. 

  869.  ExitThisRoutine:
    870. 

  870.  	if ( myPtr != NULL )
    871. 

  871.  		free( myPtr );
    872. 

  872. @@ -504,7 +536,7 @@
    873. 

  873.  	(void) fprintf(stderr, "  l = live fsck (lock down and test-only)\n");
    874. 

  874.  	(void) fprintf(stderr, "  m arg = octal mode used when creating lost+found directory \n");
    875. 

  875.  	(void) fprintf(stderr, "  n = assume a no response \n");
    876. 

  876. -	(void) fprintf(stderr, "  p = just fix normal inconsistencies \n");
    877. 

  877. +	(void) fprintf(stderr, "  p, a = just fix normal inconsistencies \n");
    878. 

  878.  	(void) fprintf(stderr, "  q = quick check returns clean, dirty, or failure \n");
    879. 

  879.  	(void) fprintf(stderr, "  r = rebuild catalog btree \n");
    880. 

  880.  	(void) fprintf(stderr, "  u = usage \n");
    881. 

  881. Files diskdev_cmds-332.14/fsck_hfs.tproj/fsck_hfs.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/fsck_hfs.o differ
    882. 

  882. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/Makefile.lnx diskdev_cmds-332.14-patched/fsck_hfs.tproj/Makefile.lnx
    883. 

  883. --- diskdev_cmds-332.14/fsck_hfs.tproj/Makefile.lnx	1970-01-01 01:00:00.000000000 +0100
    884. 

  884. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/Makefile.lnx	2008-07-01 22:30:11.000000000 +0200
    885. 

  885. @@ -0,0 +1,15 @@
    886. 

  886. +CFILES = fsck_hfs.c strings.c utilities.c cache.c
    887. 

  887. +OFILES = $(CFILES:.c=.o)
    888. 

  888. +
    889. 

  889. +all: fsck_hfs
    890. 

  890. +
    891. 

  891. +fsck_hfs: $(OFILES) dfalib/libdfa.a
    892. 

  892. +
    893. 

  893. +dfalib/libdfa.a: FORCE
    894. 

  894. +	$(MAKE) -C dfalib -f Makefile.lnx libdfa.a
    895. 

  895. +
    896. 

  896. +clean:
    897. 

  897. +	$(RM) fsck_hfs $(OFILES)
    898. 

  898. +	$(MAKE) -C dfalib -f Makefile.lnx clean
    899. 

  899. +
    900. 

  900. +.PHONY : FORCE clean
    901. 

  901. Files diskdev_cmds-332.14/fsck_hfs.tproj/strings.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/strings.o differ
    902. 

  902. diff -druN diskdev_cmds-332.14/fsck_hfs.tproj/utilities.c diskdev_cmds-332.14-patched/fsck_hfs.tproj/utilities.c
    903. 

  903. --- diskdev_cmds-332.14/fsck_hfs.tproj/utilities.c	2006-02-20 22:45:15.000000000 +0100
    904. 

  904. +++ diskdev_cmds-332.14-patched/fsck_hfs.tproj/utilities.c	2008-07-01 22:30:11.000000000 +0200
    905. 

  905. @@ -183,12 +183,14 @@
    906. 

  906.  			printf("Can't stat %s\n", raw);
    907. 

  907.  			return (origname);
    908. 

  908.  		}
    909. 

  909. +#if !LINUX
    910. 

  910.  		if ((stchar.st_mode & S_IFMT) == S_IFCHR) {
    911. 

  911.  			return (raw);
    912. 

  912.  		} else {
    913. 

  913.  			printf("%s is not a character device\n", raw);
    914. 

  914.  			return (origname);
    915. 

  915.  		}
    916. 

  916. +#endif
    917. 

  917.  	} else if ((stblock.st_mode & S_IFMT) == S_IFCHR && !retried) {
    918. 

  918.  		newname = unrawname(newname);
    919. 

  919.  		retried++;
    920. 

  920. @@ -214,7 +216,11 @@
    921. 

  921.  	*dp = 0;
    922. 

  922.  	(void)strcpy(rawbuf, name);
    923. 

  923.  	*dp = '/';
    924. 

  924. -	(void)strcat(rawbuf, "/r");
    925. 

  925. +#if LINUX
    926. 

  926. +	(void)strcat(rawbuf, "/");
    927. 

  927. +#else
    928. 

  928. +	(void)strcat(rawbuf,"/r");
    929. 

  929. +#endif
    930. 

  930.  	(void)strcat(rawbuf, &dp[1]);
    931. 

  931.  
    932. 

  932.  	return (rawbuf);
    933. 

  933. Files diskdev_cmds-332.14/fsck_hfs.tproj/utilities.o and diskdev_cmds-332.14-patched/fsck_hfs.tproj/utilities.o differ
    934. 

  934. diff -druN diskdev_cmds-332.14/include/bitstring.h diskdev_cmds-332.14-patched/include/bitstring.h
    935. 

  935. --- diskdev_cmds-332.14/include/bitstring.h	1970-01-01 01:00:00.000000000 +0100
    936. 

  936. +++ diskdev_cmds-332.14-patched/include/bitstring.h	2008-07-01 22:30:11.000000000 +0200
    937. 

  937. @@ -0,0 +1,164 @@
    938. 

  938. +/*
    939. 

  939. + * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
    940. 

  940. + *
    941. 

  941. + * @APPLE_LICENSE_HEADER_START@
    942. 

  942. + * 
    943. 

  943. + * The contents of this file constitute Original Code as defined in and
    944. 

  944. + * are subject to the Apple Public Source License Version 1.1 (the
    945. 

  945. + * "License").  You may not use this file except in compliance with the
    946. 

  946. + * License.  Please obtain a copy of the License at
    947. 

  947. + * http://www.apple.com/publicsource and read it before using this file.
    948. 

  948. + * 
    949. 

  949. + * This Original Code and all software distributed under the License are
    950. 

  950. + * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
    951. 

  951. + * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
    952. 

  952. + * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
    953. 

  953. + * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
    954. 

  954. + * License for the specific language governing rights and limitations
    955. 

  955. + * under the License.
    956. 

  956. + * 
    957. 

  957. + * @APPLE_LICENSE_HEADER_END@
    958. 

  958. + */
    959. 

  959. +/*
    960. 

  960. + * Copyright (c) 1989, 1993
    961. 

  961. + *	The Regents of the University of California.  All rights reserved.
    962. 

  962. + *
    963. 

  963. + * This code is derived from software contributed to Berkeley by
    964. 

  964. + * Paul Vixie.
    965. 

  965. + *
    966. 

  966. + * Redistribution and use in source and binary forms, with or without
    967. 

  967. + * modification, are permitted provided that the following conditions
    968. 

  968. + * are met:
    969. 

  969. + * 1. Redistributions of source code must retain the above copyright
    970. 

  970. + *    notice, this list of conditions and the following disclaimer.
    971. 

  971. + * 2. Redistributions in binary form must reproduce the above copyright
    972. 

  972. + *    notice, this list of conditions and the following disclaimer in the
    973. 

  973. + *    documentation and/or other materials provided with the distribution.
    974. 

  974. + * 3. All advertising materials mentioning features or use of this software
    975. 

  975. + *    must display the following acknowledgement:
    976. 

  976. + *	This product includes software developed by the University of
    977. 

  977. + *	California, Berkeley and its contributors.
    978. 

  978. + * 4. Neither the name of the University nor the names of its contributors
    979. 

  979. + *    may be used to endorse or promote products derived from this software
    980. 

  980. + *    without specific prior written permission.
    981. 

  981. + *
    982. 

  982. + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
    983. 

  983. + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
    984. 

  984. + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
    985. 

  985. + * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
    986. 

  986. + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
    987. 

  987. + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
    988. 

  988. + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
    989. 

  989. + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
    990. 

  990. + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
    991. 

  991. + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    992. 

  992. + * SUCH DAMAGE.
    993. 

  993. + *
    994. 

  994. + *	@(#)bitstring.h	8.1 (Berkeley) 7/19/93
    995. 

  995. + */
    996. 

  996. +
    997. 

  997. +#ifndef _BITSTRING_H_
    998. 

  998. +#define	_BITSTRING_H_
    999. 

  999. +
    1000. 

  1000. +typedef	unsigned char bitstr_t;
    1001. 

  1001. +
    1002. 

  1002. +/* internal macros */
    1003. 

  1003. +				/* byte of the bitstring bit is in */
    1004. 

  1004. +#define	_bit_byte(bit) \
    1005. 

  1005. +	((bit) >> 3)
    1006. 

  1006. +
    1007. 

  1007. +				/* mask for the bit within its byte */
    1008. 

  1008. +#define	_bit_mask(bit) \
    1009. 

  1009. +	(1 << ((bit)&0x7))
    1010. 

  1010. +
    1011. 

  1011. +/* external macros */
    1012. 

  1012. +				/* bytes in a bitstring of nbits bits */
    1013. 

  1013. +#define	bitstr_size(nbits) \
    1014. 

  1014. +	((((nbits) - 1) >> 3) + 1)
    1015. 

  1015. +
    1016. 

  1016. +				/* allocate a bitstring */
    1017. 

  1017. +#define	bit_alloc(nbits) \
    1018. 

  1018. +	(bitstr_t *)calloc(1, \
    1019. 

  1019. +	    (unsigned int)bitstr_size(nbits) * sizeof(bitstr_t))
    1020. 

  1020. +
    1021. 

  1021. +				/* allocate a bitstring on the stack */
    1022. 

  1022. +#define	bit_decl(name, nbits) \
    1023. 

  1023. +	(name)[bitstr_size(nbits)]
    1024. 

  1024. +
    1025. 

  1025. +				/* is bit N of bitstring name set? */
    1026. 

  1026. +#define	bit_test(name, bit) \
    1027. 

  1027. +	((name)[_bit_byte(bit)] & _bit_mask(bit))
    1028. 

  1028. +
    1029. 

  1029. +				/* set bit N of bitstring name */
    1030. 

  1030. +#define	bit_set(name, bit) \
    1031. 

  1031. +	(name)[_bit_byte(bit)] |= _bit_mask(bit)
    1032. 

  1032. +
    1033. 

  1033. +				/* clear bit N of bitstring name */
    1034. 

  1034. +#define	bit_clear(name, bit) \
    1035. 

  1035. +	(name)[_bit_byte(bit)] &= ~_bit_mask(bit)
    1036. 

  1036. +
    1037. 

  1037. +				/* clear bits start ... stop in bitstring */
    1038. 

  1038. +#define	bit_nclear(name, start, stop) { \
    1039. 

  1039. +	register bitstr_t *_name = name; \
    1040. 

  1040. +	register int _start = start, _stop = stop; \
    1041. 

  1041. +	register int _startbyte = _bit_byte(_start); \
    1042. 

  1042. +	register int _stopbyte = _bit_byte(_stop); \
    1043. 

  1043. +	if (_startbyte == _stopbyte) { \
    1044. 

  1044. +		_name[_startbyte] &= ((0xff >> (8 - (_start&0x7))) | \
    1045. 

  1045. +				      (0xff << ((_stop&0x7) + 1))); \
    1046. 

  1046. +	} else { \
    1047. 

  1047. +		_name[_startbyte] &= 0xff >> (8 - (_start&0x7)); \
    1048. 

  1048. +		while (++_startbyte < _stopbyte) \
    1049. 

  1049. +			_name[_startbyte] = 0; \
    1050. 

  1050. +		_name[_stopbyte] &= 0xff << ((_stop&0x7) + 1); \
    1051. 

  1051. +	} \
    1052. 

  1052. +}
    1053. 

  1053. +
    1054. 

  1054. +				/* set bits start ... stop in bitstring */
    1055. 

  1055. +#define	bit_nset(name, start, stop) { \
    1056. 

  1056. +	register bitstr_t *_name = name; \
    1057. 

  1057. +	register int _start = start, _stop = stop; \
    1058. 

  1058. +	register int _startbyte = _bit_byte(_start); \
    1059. 

  1059. +	register int _stopbyte = _bit_byte(_stop); \
    1060. 

  1060. +	if (_startbyte == _stopbyte) { \
    1061. 

  1061. +		_name[_startbyte] |= ((0xff << (_start&0x7)) & \
    1062. 

  1062. +				    (0xff >> (7 - (_stop&0x7)))); \
    1063. 

  1063. +	} else { \
    1064. 

  1064. +		_name[_startbyte] |= 0xff << ((_start)&0x7); \
    1065. 

  1065. +		while (++_startbyte < _stopbyte) \
    1066. 

  1066. +	    		_name[_startbyte] = 0xff; \
    1067. 

  1067. +		_name[_stopbyte] |= 0xff >> (7 - (_stop&0x7)); \
    1068. 

  1068. +	} \
    1069. 

  1069. +}
    1070. 

  1070. +
    1071. 

  1071. +				/* find first bit clear in name */
    1072. 

  1072. +#define	bit_ffc(name, nbits, value) { \
    1073. 

  1073. +	register bitstr_t *_name = name; \
    1074. 

  1074. +	register int _byte, _nbits = nbits; \
    1075. 

  1075. +	register int _stopbyte = _bit_byte(_nbits), _value = -1; \
    1076. 

  1076. +	for (_byte = 0; _byte <= _stopbyte; ++_byte) \
    1077. 

  1077. +		if (_name[_byte] != 0xff) { \
    1078. 

  1078. +			_value = _byte << 3; \
    1079. 

  1079. +			for (_stopbyte = _name[_byte]; (_stopbyte&0x1); \
    1080. 

  1080. +			    ++_value, _stopbyte >>= 1); \
    1081. 

  1081. +			break; \
    1082. 

  1082. +		} \
    1083. 

  1083. +	*(value) = _value; \
    1084. 

  1084. +}
    1085. 

  1085. +
    1086. 

  1086. +				/* find first bit set in name */
    1087. 

  1087. +#define	bit_ffs(name, nbits, value) { \
    1088. 

  1088. +	register bitstr_t *_name = name; \
    1089. 

  1089. +	register int _byte, _nbits = nbits; \
    1090. 

  1090. +	register int _stopbyte = _bit_byte(_nbits), _value = -1; \
    1091. 

  1091. +	for (_byte = 0; _byte <= _stopbyte; ++_byte) \
    1092. 

  1092. +		if (_name[_byte]) { \
    1093. 

  1093. +			_value = _byte << 3; \
    1094. 

  1094. +			for (_stopbyte = _name[_byte]; !(_stopbyte&0x1); \
    1095. 

  1095. +			    ++_value, _stopbyte >>= 1); \
    1096. 

  1096. +			break; \
    1097. 

  1097. +		} \
    1098. 

  1098. +	*(value) = _value; \
    1099. 

  1099. +}
    1100. 

  1100. +
    1101. 

  1101. +#endif /* !_BITSTRING_H_ */
    1102. 

  1102. diff -druN diskdev_cmds-332.14/include/hfs/hfs_format.h diskdev_cmds-332.14-patched/include/hfs/hfs_format.h
    1103. 

  1103. --- diskdev_cmds-332.14/include/hfs/hfs_format.h	1970-01-01 01:00:00.000000000 +0100
    1104. 

  1104. +++ diskdev_cmds-332.14-patched/include/hfs/hfs_format.h	2008-07-01 22:30:11.000000000 +0200
    1105. 

  1105. @@ -0,0 +1,689 @@
    1106. 

  1106. +/*
    1107. 

  1107. + * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
    1108. 

  1108. + *
    1109. 

  1109. + * @APPLE_LICENSE_HEADER_START@
    1110. 

  1110. + * 
    1111. 

  1111. + * The contents of this file constitute Original Code as defined in and
    1112. 

  1112. + * are subject to the Apple Public Source License Version 1.1 (the
    1113. 

  1113. + * "License").  You may not use this file except in compliance with the
    1114. 

  1114. + * License.  Please obtain a copy of the License at
    1115. 

  1115. + * http://www.apple.com/publicsource and read it before using this file.
    1116. 

  1116. + * 
    1117. 

  1117. + * This Original Code and all software distributed under the License are
    1118. 

  1118. + * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
    1119. 

  1119. + * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
    1120. 

  1120. + * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
    1121. 

  1121. + * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
    1122. 

  1122. + * License for the specific language governing rights and limitations
    1123. 

  1123. + * under the License.
    1124. 

  1124. + * 
    1125. 

  1125. + * @APPLE_LICENSE_HEADER_END@
    1126. 

  1126. + */
    1127. 

  1127. +#ifndef __HFS_FORMAT__
    1128. 

  1128. +#define __HFS_FORMAT__
    1129. 

  1129. +
    1130. 

  1130. +#include "missing.h"
    1131. 

  1131. +
    1132. 

  1132. +#include <sys/appleapiopts.h>
    1133. 

  1133. +
    1134. 

  1134. +/*
    1135. 

  1135. + * hfs_format.c
    1136. 

  1136. + *
    1137. 

  1137. + * This file describes the on-disk format for HFS and HFS Plus volumes.
    1138. 

  1138. + * The HFS Plus volume format is desciibed in detail in Apple Technote 1150.
    1139. 

  1139. + *
    1140. 

  1140. + * http://developer.apple.com/technotes/tn/tn1150.html
    1141. 

  1141. + *
    1142. 

  1142. + */
    1143. 

  1143. +
    1144. 

  1144. +#ifdef __cplusplus
    1145. 

  1145. +extern "C" {
    1146. 

  1146. +#endif
    1147. 

  1147. +
    1148. 

  1148. +/* some on-disk hfs structures have 68K alignment (misaligned) */
    1149. 

  1149. +
    1150. 

  1150. +#define PACKED_S	__attribute__((packed))
    1151. 

  1151. +	
    1152. 

  1152. +/* Signatures used to differentiate between HFS and HFS Plus volumes */
    1153. 

  1153. +enum {
    1154. 

  1154. +	kHFSSigWord		= 0x4244,	/* 'BD' in ASCII */
    1155. 

  1155. +	kHFSPlusSigWord		= 0x482B,	/* 'H+' in ASCII */
    1156. 

  1156. +	kHFSXSigWord		= 0x4858,	/* 'HX' in ASCII */
    1157. 

  1157. +
    1158. 

  1158. +	kHFSPlusVersion		= 0x0004,	/* 'H+' volumes are version 4 only */
    1159. 

  1159. +	kHFSXVersion		= 0x0005,	/* 'HX' volumes start with version 5 */
    1160. 

  1160. +
    1161. 

  1161. +	kHFSPlusMountVersion	= 0x31302E30,	/* '10.0' for Mac OS X */
    1162. 

  1162. +	kHFSJMountVersion	= 0x4846534a,	/* 'HFSJ' for journaled HFS+ on OS X */
    1163. 

  1163. +	kFSKMountVersion	= 0x46534b21	/* 'FSK!' for failed journal replay */
    1164. 

  1164. +}PACKED_S;
    1165. 

  1165. +
    1166. 

  1166. +
    1167. 

  1167. +#ifdef __APPLE_API_PRIVATE
    1168. 

  1168. +/*
    1169. 

  1169. + * Mac OS X has a special directory for linked and unlinked files (HFS Plus only).
    1170. 

  1170. + * This directory and its contents are never exported from the filesystem under
    1171. 

  1171. + * Mac OS X.
    1172. 

  1172. + *
    1173. 

  1173. + * To make this folder name sort last,  it has embedded null prefix.
    1174. 

  1174. + * (0xC0, 0x80 in UTF-8)
    1175. 

  1175. + */
    1176. 

  1176. +#define HFSPLUSMETADATAFOLDER  "\xC0\x80\xC0\x80\xC0\x80\xC0\x80HFS+ Private Data"
    1177. 

  1177. +
    1178. 

  1178. +/*
    1179. 

  1179. + * Files in the HFS Private Data folder have one of the following prefixes
    1180. 

  1180. + * followed by a decimal number (no leading zeros).  For indirect nodes this
    1181. 

  1181. + * number is a 32 bit random number.  For unlinked (deleted) files that are
    1182. 

  1182. + * still open, the number is the file ID for that file.
    1183. 

  1183. + *
    1184. 

  1184. + * e.g.  iNode7182000 and temp3296
    1185. 

  1185. + */
    1186. 

  1186. +#define HFS_INODE_PREFIX	"iNode"
    1187. 

  1187. +#define HFS_DELETE_PREFIX	"temp"
    1188. 

  1188. +
    1189. 

  1189. +#endif /* __APPLE_API_PRIVATE */
    1190. 

  1190. +
    1191. 

  1191. +/*
    1192. 

  1192. + * Indirect link files (hard links) have the following type/creator.
    1193. 

  1193. + */
    1194. 

  1194. +enum {
    1195. 

  1195. +	kHardLinkFileType = 0x686C6E6B,  /* 'hlnk' */
    1196. 

  1196. +	kHFSPlusCreator   = 0x6866732B   /* 'hfs+' */
    1197. 

  1197. +}PACKED_S;
    1198. 

  1198. +
    1199. 

  1199. +
    1200. 

  1200. +#ifndef _HFSUNISTR255_DEFINED_
    1201. 

  1201. +#define _HFSUNISTR255_DEFINED_
    1202. 

  1202. +/* Unicode strings are used for HFS Plus file and folder names */
    1203. 

  1203. +struct HFSUniStr255 {
    1204. 

  1204. +	u_int16_t	length;		/* number of unicode characters */
    1205. 

  1205. +	u_int16_t	unicode[255];	/* unicode characters */
    1206. 

  1206. +} PACKED_S;
    1207. 

  1207. +typedef struct HFSUniStr255 HFSUniStr255;
    1208. 

  1208. +typedef const HFSUniStr255 *ConstHFSUniStr255Param;
    1209. 

  1209. +#endif /* _HFSUNISTR255_DEFINED_ */
    1210. 

  1210. +
    1211. 

  1211. +enum {
    1212. 

  1212. +	kHFSMaxVolumeNameChars		= 27,
    1213. 

  1213. +	kHFSMaxFileNameChars		= 31,
    1214. 

  1214. +	kHFSPlusMaxFileNameChars	= 255
    1215. 

  1215. +}PACKED_S;
    1216. 

  1216. +
    1217. 

  1217. +
    1218. 

  1218. +/* Extent overflow file data structures */
    1219. 

  1219. +
    1220. 

  1220. +/* HFS Extent key */
    1221. 

  1221. +struct HFSExtentKey {
    1222. 

  1222. +	u_int8_t 	keyLength;	/* length of key, excluding this field */
    1223. 

  1223. +	u_int8_t 	forkType;	/* 0 = data fork, FF = resource fork */
    1224. 

  1224. +	u_int32_t 	fileID;		/* file ID */
    1225. 

  1225. +	u_int16_t 	startBlock;	/* first file allocation block number in this extent */
    1226. 

  1226. +}PACKED_S;
    1227. 

  1227. +typedef struct HFSExtentKey HFSExtentKey;
    1228. 

  1228. +
    1229. 

  1229. +/* HFS Plus Extent key */
    1230. 

  1230. +struct HFSPlusExtentKey {
    1231. 

  1231. +	u_int16_t 	keyLength;		/* length of key, excluding this field */
    1232. 

  1232. +	u_int8_t 	forkType;		/* 0 = data fork, FF = resource fork */
    1233. 

  1233. +	u_int8_t 	pad;			/* make the other fields align on 32-bit boundary */
    1234. 

  1234. +	u_int32_t 	fileID;			/* file ID */
    1235. 

  1235. +	u_int32_t 	startBlock;		/* first file allocation block number in this extent */
    1236. 

  1236. +}PACKED_S;
    1237. 

  1237. +typedef struct HFSPlusExtentKey HFSPlusExtentKey;
    1238. 

  1238. +
    1239. 

  1239. +/* Number of extent descriptors per extent record */
    1240. 

  1240. +enum {
    1241. 

  1241. +	kHFSExtentDensity	= 3,
    1242. 

  1242. +	kHFSPlusExtentDensity	= 8
    1243. 

  1243. +}PACKED_S;
    1244. 

  1244. +
    1245. 

  1245. +/* HFS extent descriptor */
    1246. 

  1246. +struct HFSExtentDescriptor {
    1247. 

  1247. +	u_int16_t 	startBlock;		/* first allocation block */
    1248. 

  1248. +	u_int16_t 	blockCount;		/* number of allocation blocks */
    1249. 

  1249. +}PACKED_S;
    1250. 

  1250. +typedef struct HFSExtentDescriptor HFSExtentDescriptor;
    1251. 

  1251. +
    1252. 

  1252. +/* HFS Plus extent descriptor */
    1253. 

  1253. +struct HFSPlusExtentDescriptor {
    1254. 

  1254. +	u_int32_t 	startBlock;		/* first allocation block */
    1255. 

  1255. +	u_int32_t 	blockCount;		/* number of allocation blocks */
    1256. 

  1256. +}PACKED_S;
    1257. 

  1257. +typedef struct HFSPlusExtentDescriptor HFSPlusExtentDescriptor;
    1258. 

  1258. +
    1259. 

  1259. +/* HFS extent record */
    1260. 

  1260. +typedef HFSExtentDescriptor HFSExtentRecord[3];
    1261. 

  1261. +
    1262. 

  1262. +/* HFS Plus extent record */
    1263. 

  1263. +typedef HFSPlusExtentDescriptor HFSPlusExtentRecord[8];
    1264. 

  1264. +
    1265. 

  1265. +
    1266. 

  1266. +/* Finder information */
    1267. 

  1267. +struct FndrFileInfo {
    1268. 

  1268. +	u_int32_t 	fdType;		/* file type */
    1269. 

  1269. +	u_int32_t 	fdCreator;	/* file creator */
    1270. 

  1270. +	u_int16_t 	fdFlags;	/* Finder flags */
    1271. 

  1271. +	struct {
    1272. 

  1272. +	    int16_t	v;		/* file's location */
    1273. 

  1273. +	    int16_t	h;
    1274. 

  1274. +	} PACKED_S fdLocation;
    1275. 

  1275. +	int16_t 	opaque;
    1276. 

  1276. +}PACKED_S;
    1277. 

  1277. +typedef struct FndrFileInfo FndrFileInfo;
    1278. 

  1278. +
    1279. 

  1279. +struct FndrDirInfo {
    1280. 

  1280. +	struct {			/* folder's window rectangle */
    1281. 

  1281. +	    int16_t	top;
    1282. 

  1282. +	    int16_t	left;
    1283. 

  1283. +	    int16_t	bottom;
    1284. 

  1284. +	    int16_t	right;
    1285. 

  1285. +	}PACKED_S frRect;
    1286. 

  1286. +	unsigned short 	frFlags;	/* Finder flags */
    1287. 

  1287. +	struct {
    1288. 

  1288. +	    u_int16_t	v;		/* folder's location */
    1289. 

  1289. +	    u_int16_t	h;
    1290. 

  1290. +	}PACKED_S frLocation;
    1291. 

  1291. +	int16_t 	opaque;
    1292. 

  1292. +}PACKED_S;
    1293. 

  1293. +typedef struct FndrDirInfo FndrDirInfo;
    1294. 

  1294. +
    1295. 

  1295. +struct FndrOpaqueInfo {
    1296. 

  1296. +	int8_t opaque[16];
    1297. 

  1297. +}PACKED_S;
    1298. 

  1298. +typedef struct FndrOpaqueInfo FndrOpaqueInfo;
    1299. 

  1299. +
    1300. 

  1300. +
    1301. 

  1301. +/* HFS Plus Fork data info - 80 bytes */
    1302. 

  1302. +struct HFSPlusForkData {
    1303. 

  1303. +	u_int64_t 		logicalSize;	/* fork's logical size in bytes */
    1304. 

  1304. +	u_int32_t 		clumpSize;	/* fork's clump size in bytes */
    1305. 

  1305. +	u_int32_t 		totalBlocks;	/* total blocks used by this fork */
    1306. 

  1306. +	HFSPlusExtentRecord 	extents;	/* initial set of extents */
    1307. 

  1307. +}PACKED_S;
    1308. 

  1308. +typedef struct HFSPlusForkData HFSPlusForkData;
    1309. 

  1309. +
    1310. 

  1310. +
    1311. 

  1311. +/* Mac OS X has 16 bytes worth of "BSD" info.
    1312. 

  1312. + *
    1313. 

  1313. + * Note:  Mac OS 9 implementations and applications
    1314. 

  1314. + * should preserve, but not change, this information.
    1315. 

  1315. + */
    1316. 

  1316. +struct HFSPlusBSDInfo {
    1317. 

  1317. +	u_int32_t 	ownerID;	/* user or group ID of file/folder owner */
    1318. 

  1318. +	u_int32_t 	groupID;	/* additional user of group ID */
    1319. 

  1319. +	u_int8_t 	adminFlags;	/* super-user changeable flags */
    1320. 

  1320. +	u_int8_t 	ownerFlags;	/* owner changeable flags */
    1321. 

  1321. +	u_int16_t 	fileMode;	/* file type and permission bits */
    1322. 

  1322. +	union {
    1323. 

  1323. +	    u_int32_t	iNodeNum;	/* indirect node number (hard links only) */
    1324. 

  1324. +	    u_int32_t	linkCount;	/* links that refer to this indirect node */
    1325. 

  1325. +	    u_int32_t	rawDevice;	/* special file device (FBLK and FCHR only) */
    1326. 

  1326. +	}PACKED_S special;
    1327. 

  1327. +}PACKED_S;
    1328. 

  1328. +typedef struct HFSPlusBSDInfo HFSPlusBSDInfo;
    1329. 

  1329. +
    1330. 

  1330. +
    1331. 

  1331. +/* Catalog file data structures */
    1332. 

  1332. +
    1333. 

  1333. +enum {
    1334. 

  1334. +	kHFSRootParentID		= 1,	/* Parent ID of the root folder */
    1335. 

  1335. +	kHFSRootFolderID		= 2,	/* Folder ID of the root folder */
    1336. 

  1336. +	kHFSExtentsFileID		= 3,	/* File ID of the extents file */
    1337. 

  1337. +	kHFSCatalogFileID		= 4,	/* File ID of the catalog file */
    1338. 

  1338. +	kHFSBadBlockFileID		= 5,	/* File ID of the bad allocation block file */
    1339. 

  1339. +	kHFSAllocationFileID		= 6,	/* File ID of the allocation file (HFS Plus only) */
    1340. 

  1340. +	kHFSStartupFileID		= 7,	/* File ID of the startup file (HFS Plus only) */
    1341. 

  1341. +	kHFSAttributesFileID		= 8,	/* File ID of the attribute file (HFS Plus only) */
    1342. 

  1342. +	kHFSRepairCatalogFileID		= 14,	/* Used when rebuilding Catalog B-tree */
    1343. 

  1343. +	kHFSBogusExtentFileID		= 15,	/* Used for exchanging extents in extents file */
    1344. 

  1344. +	kHFSFirstUserCatalogNodeID	= 16
    1345. 

  1345. +}PACKED_S;
    1346. 

  1346. +
    1347. 

  1347. +/* HFS catalog key */
    1348. 

  1348. +struct HFSCatalogKey {
    1349. 

  1349. +	u_int8_t 	keyLength;		/* key length (in bytes) */
    1350. 

  1350. +	u_int8_t 	reserved;		/* reserved (set to zero) */
    1351. 

  1351. +	u_int32_t 	parentID;		/* parent folder ID */
    1352. 

  1352. +	u_int8_t 	nodeName[kHFSMaxFileNameChars + 1]; /* catalog node name */
    1353. 

  1353. +}PACKED_S;
    1354. 

  1354. +typedef struct HFSCatalogKey HFSCatalogKey;
    1355. 

  1355. +
    1356. 

  1356. +/* HFS Plus catalog key */
    1357. 

  1357. +struct HFSPlusCatalogKey {
    1358. 

  1358. +	u_int16_t 		keyLength;	/* key length (in bytes) */
    1359. 

  1359. +	u_int32_t 		parentID;	/* parent folder ID */
    1360. 

  1360. +	HFSUniStr255 		nodeName;	/* catalog node name */
    1361. 

  1361. +}PACKED_S;
    1362. 

  1362. +typedef struct HFSPlusCatalogKey HFSPlusCatalogKey;
    1363. 

  1363. +
    1364. 

  1364. +/* Catalog record types */
    1365. 

  1365. +enum {
    1366. 

  1366. +	/* HFS Catalog Records */
    1367. 

  1367. +	kHFSFolderRecord		= 0x0100,	/* Folder record */
    1368. 

  1368. +	kHFSFileRecord			= 0x0200,	/* File record */
    1369. 

  1369. +	kHFSFolderThreadRecord		= 0x0300,	/* Folder thread record */
    1370. 

  1370. +	kHFSFileThreadRecord		= 0x0400,	/* File thread record */
    1371. 

  1371. +
    1372. 

  1372. +	/* HFS Plus Catalog Records */
    1373. 

  1373. +	kHFSPlusFolderRecord		= 1,		/* Folder record */
    1374. 

  1374. +	kHFSPlusFileRecord		= 2,		/* File record */
    1375. 

  1375. +	kHFSPlusFolderThreadRecord	= 3,		/* Folder thread record */
    1376. 

  1376. +	kHFSPlusFileThreadRecord	= 4		/* File thread record */
    1377. 

  1377. +}PACKED_S;
    1378. 

  1378. +
    1379. 

  1379. +
    1380. 

  1380. +/* Catalog file record flags */
    1381. 

  1381. +enum {
    1382. 

  1382. +	kHFSFileLockedBit	= 0x0000,	/* file is locked and cannot be written to */
    1383. 

  1383. +	kHFSFileLockedMask	= 0x0001,
    1384. 

  1384. +
    1385. 

  1385. +	kHFSThreadExistsBit	= 0x0001,	/* a file thread record exists for this file */
    1386. 

  1386. +	kHFSThreadExistsMask	= 0x0002,
    1387. 

  1387. +
    1388. 

  1388. +	kHFSHasAttributesBit	= 0x0002,	/* object has extended attributes */
    1389. 

  1389. +	kHFSHasAttributesMask	= 0x0004,
    1390. 

  1390. +
    1391. 

  1391. +	kHFSHasSecurityBit	= 0x0003,	/* object has security data (ACLs) */
    1392. 

  1392. +	kHFSHasSecurityMask	= 0x0008
    1393. 

  1393. +}PACKED_S;
    1394. 

  1394. +
    1395. 

  1395. +
    1396. 

  1396. +/* HFS catalog folder record - 70 bytes */
    1397. 

  1397. +struct HFSCatalogFolder {
    1398. 

  1398. +	int16_t 		recordType;		/* == kHFSFolderRecord */
    1399. 

  1399. +	u_int16_t 		flags;			/* folder flags */
    1400. 

  1400. +	u_int16_t 		valence;		/* folder valence */
    1401. 

  1401. +	u_int32_t		folderID;		/* folder ID */
    1402. 

  1402. +	u_int32_t 		createDate;		/* date and time of creation */
    1403. 

  1403. +	u_int32_t 		modifyDate;		/* date and time of last modification */
    1404. 

  1404. +	u_int32_t 		backupDate;		/* date and time of last backup */
    1405. 

  1405. +	FndrDirInfo 		userInfo;		/* Finder information */
    1406. 

  1406. +	FndrOpaqueInfo		finderInfo;		/* additional Finder information */
    1407. 

  1407. +	u_int32_t 		reserved[4];		/* reserved - initialized as zero */
    1408. 

  1408. +}PACKED_S;
    1409. 

  1409. +typedef struct HFSCatalogFolder HFSCatalogFolder;
    1410. 

  1410. +
    1411. 

  1411. +/* HFS Plus catalog folder record - 88 bytes */
    1412. 

  1412. +struct HFSPlusCatalogFolder {
    1413. 

  1413. +	int16_t 		recordType;		/* == kHFSPlusFolderRecord */
    1414. 

  1414. +	u_int16_t 		flags;			/* file flags */
    1415. 

  1415. +	u_int32_t 		valence;		/* folder's valence (limited to 2^16 in Mac OS) */
    1416. 

  1416. +	u_int32_t 		folderID;		/* folder ID */
    1417. 

  1417. +	u_int32_t 		createDate;		/* date and time of creation */
    1418. 

  1418. +	u_int32_t 		contentModDate;		/* date and time of last content modification */
    1419. 

  1419. +	u_int32_t 		attributeModDate;	/* date and time of last attribute modification */
    1420. 

  1420. +	u_int32_t 		accessDate;		/* date and time of last access (MacOS X only) */
    1421. 

  1421. +	u_int32_t 		backupDate;		/* date and time of last backup */
    1422. 

  1422. +	HFSPlusBSDInfo		bsdInfo;		/* permissions (for MacOS X) */
    1423. 

  1423. +	FndrDirInfo 		userInfo;		/* Finder information */
    1424. 

  1424. +	FndrOpaqueInfo	 	finderInfo;		/* additional Finder information */
    1425. 

  1425. +	u_int32_t 		textEncoding;		/* hint for name conversions */
    1426. 

  1426. +	u_int32_t 		attrBlocks;		/* cached count of attribute data blocks */
    1427. 

  1427. +}PACKED_S;
    1428. 

  1428. +typedef struct HFSPlusCatalogFolder HFSPlusCatalogFolder;
    1429. 

  1429. +
    1430. 

  1430. +/* HFS catalog file record - 102 bytes */
    1431. 

  1431. +struct HFSCatalogFile {
    1432. 

  1432. +	int16_t 		recordType;		/* == kHFSFileRecord */
    1433. 

  1433. +	u_int8_t 		flags;			/* file flags */
    1434. 

  1434. +	int8_t 			fileType;		/* file type (unused ?) */
    1435. 

  1435. +	FndrFileInfo 		userInfo;		/* Finder information */
    1436. 

  1436. +	u_int32_t 		fileID;			/* file ID */
    1437. 

  1437. +	u_int16_t 		dataStartBlock;		/* not used - set to zero */
    1438. 

  1438. +	int32_t 		dataLogicalSize;	/* logical EOF of data fork */
    1439. 

  1439. +	int32_t 		dataPhysicalSize;	/* physical EOF of data fork */
    1440. 

  1440. +	u_int16_t		rsrcStartBlock;		/* not used - set to zero */
    1441. 

  1441. +	int32_t			rsrcLogicalSize;	/* logical EOF of resource fork */
    1442. 

  1442. +	int32_t			rsrcPhysicalSize;	/* physical EOF of resource fork */
    1443. 

  1443. +	u_int32_t		createDate;		/* date and time of creation */
    1444. 

  1444. +	u_int32_t		modifyDate;		/* date and time of last modification */
    1445. 

  1445. +	u_int32_t		backupDate;		/* date and time of last backup */
    1446. 

  1446. +	FndrOpaqueInfo		finderInfo;		/* additional Finder information */
    1447. 

  1447. +	u_int16_t		clumpSize;		/* file clump size (not used) */
    1448. 

  1448. +	HFSExtentRecord		dataExtents;		/* first data fork extent record */
    1449. 

  1449. +	HFSExtentRecord		rsrcExtents;		/* first resource fork extent record */
    1450. 

  1450. +	u_int32_t		reserved;		/* reserved - initialized as zero */
    1451. 

  1451. +}PACKED_S;
    1452. 

  1452. +typedef struct HFSCatalogFile HFSCatalogFile;
    1453. 

  1453. +
    1454. 

  1454. +/* HFS Plus catalog file record - 248 bytes */
    1455. 

  1455. +struct HFSPlusCatalogFile {
    1456. 

  1456. +	int16_t 		recordType;		/* == kHFSPlusFileRecord */
    1457. 

  1457. +	u_int16_t 		flags;			/* file flags */
    1458. 

  1458. +	u_int32_t 		reserved1;		/* reserved - initialized as zero */
    1459. 

  1459. +	u_int32_t 		fileID;			/* file ID */
    1460. 

  1460. +	u_int32_t 		createDate;		/* date and time of creation */
    1461. 

  1461. +	u_int32_t 		contentModDate;		/* date and time of last content modification */
    1462. 

  1462. +	u_int32_t 		attributeModDate;	/* date and time of last attribute modification */
    1463. 

  1463. +	u_int32_t 		accessDate;		/* date and time of last access (MacOS X only) */
    1464. 

  1464. +	u_int32_t 		backupDate;		/* date and time of last backup */
    1465. 

  1465. +	HFSPlusBSDInfo 		bsdInfo;		/* permissions (for MacOS X) */
    1466. 

  1466. +	FndrFileInfo 		userInfo;		/* Finder information */
    1467. 

  1467. +	FndrOpaqueInfo	 	finderInfo;		/* additional Finder information */
    1468. 

  1468. +	u_int32_t 		textEncoding;		/* hint for name conversions */
    1469. 

  1469. +	u_int32_t 		attrBlocks;		/* cached count of attribute data blocks */
    1470. 

  1470. +
    1471. 

  1471. +	/* Note: these start on double long (64 bit) boundry */
    1472. 

  1472. +	HFSPlusForkData 	dataFork;		/* size and block data for data fork */
    1473. 

  1473. +	HFSPlusForkData 	resourceFork;		/* size and block data for resource fork */
    1474. 

  1474. +}PACKED_S;
    1475. 

  1475. +typedef struct HFSPlusCatalogFile HFSPlusCatalogFile;
    1476. 

  1476. +
    1477. 

  1477. +/* HFS catalog thread record - 46 bytes */
    1478. 

  1478. +struct HFSCatalogThread {
    1479. 

  1479. +	int16_t 	recordType;		/* == kHFSFolderThreadRecord or kHFSFileThreadRecord */
    1480. 

  1480. +	int32_t 	reserved[2];		/* reserved - initialized as zero */
    1481. 

  1481. +	u_int32_t 	parentID;		/* parent ID for this catalog node */
    1482. 

  1482. +	u_int8_t 	nodeName[kHFSMaxFileNameChars + 1]; /* name of this catalog node */
    1483. 

  1483. +}PACKED_S;
    1484. 

  1484. +typedef struct HFSCatalogThread HFSCatalogThread;
    1485. 

  1485. +
    1486. 

  1486. +/* HFS Plus catalog thread record -- 264 bytes */
    1487. 

  1487. +struct HFSPlusCatalogThread {
    1488. 

  1488. +	int16_t 	recordType;		/* == kHFSPlusFolderThreadRecord or kHFSPlusFileThreadRecord */
    1489. 

  1489. +	int16_t 	reserved;		/* reserved - initialized as zero */
    1490. 

  1490. +	u_int32_t 	parentID;		/* parent ID for this catalog node */
    1491. 

  1491. +	HFSUniStr255 	nodeName;		/* name of this catalog node (variable length) */
    1492. 

  1492. +}PACKED_S;
    1493. 

  1493. +typedef struct HFSPlusCatalogThread HFSPlusCatalogThread;
    1494. 

  1494. +
    1495. 

  1495. +#ifdef __APPLE_API_UNSTABLE
    1496. 

  1496. +/*
    1497. 

  1497. +  	These are the types of records in the attribute B-tree.  The values were
    1498. 

  1498. +  	chosen so that they wouldn't conflict with the catalog record types.
    1499. 

  1499. +*/
    1500. 

  1500. +enum {
    1501. 

  1501. +	kHFSPlusAttrInlineData	= 0x10,    /* if size <  kAttrOverflowSize */
    1502. 

  1502. +	kHFSPlusAttrForkData	= 0x20,    /* if size >= kAttrOverflowSize */
    1503. 

  1503. +	kHFSPlusAttrExtents	= 0x30     /* overflow extents for large attributes */
    1504. 

  1504. +}PACKED_S;
    1505. 

  1505. +
    1506. 

  1506. +
    1507. 

  1507. +/*
    1508. 

  1508. +  	HFSPlusAttrForkData
    1509. 

  1509. +  	For larger attributes, whose value is stored in allocation blocks.
    1510. 

  1510. +  	If the attribute has more than 8 extents, there will be additonal
    1511. 

  1511. +  	records (of type HFSPlusAttrExtents) for this attribute.
    1512. 

  1512. +*/
    1513. 

  1513. +struct HFSPlusAttrForkData {
    1514. 

  1514. +	u_int32_t 	recordType;		/* == kHFSPlusAttrForkData*/
    1515. 

  1515. +	u_int32_t 	reserved;
    1516. 

  1516. +	HFSPlusForkData theFork;		/* size and first extents of value*/
    1517. 

  1517. +}PACKED_S;
    1518. 

  1518. +typedef struct HFSPlusAttrForkData HFSPlusAttrForkData;
    1519. 

  1519. +
    1520. 

  1520. +/*
    1521. 

  1521. +  	HFSPlusAttrExtents
    1522. 

  1522. +  	This record contains information about overflow extents for large,
    1523. 

  1523. +  	fragmented attributes.
    1524. 

  1524. +*/
    1525. 

  1525. +struct HFSPlusAttrExtents {
    1526. 

  1526. +	u_int32_t 		recordType;	/* == kHFSPlusAttrExtents*/
    1527. 

  1527. +	u_int32_t 		reserved;
    1528. 

  1528. +	HFSPlusExtentRecord	extents;	/* additional extents*/
    1529. 

  1529. +}PACKED_S;
    1530. 

  1530. +typedef struct HFSPlusAttrExtents HFSPlusAttrExtents;
    1531. 

  1531. +
    1532. 

  1532. +/*
    1533. 

  1533. + * Atrributes B-tree Data Record
    1534. 

  1534. + *
    1535. 

  1535. + * For small attributes, whose entire value is stored
    1536. 

  1536. + * within a single B-tree record.
    1537. 

  1537. + */
    1538. 

  1538. +struct HFSPlusAttrData {
    1539. 

  1539. +	u_int32_t    recordType;   /* == kHFSPlusAttrInlineData */
    1540. 

  1540. +	u_int32_t    reserved[2];
    1541. 

  1541. +	u_int32_t    attrSize;     /* size of attribute data in bytes */
    1542. 

  1542. +	u_int8_t     attrData[2];  /* variable length */
    1543. 

  1543. +}PACKED_S;
    1544. 

  1544. +typedef struct HFSPlusAttrData HFSPlusAttrData;
    1545. 

  1545. +
    1546. 

  1546. +
    1547. 

  1547. +/* HFSPlusAttrInlineData is obsolete use HFSPlusAttrData instead */
    1548. 

  1548. +struct HFSPlusAttrInlineData {
    1549. 

  1549. +	u_int32_t 	recordType;
    1550. 

  1550. +	u_int32_t 	reserved;
    1551. 

  1551. +	u_int32_t 	logicalSize;
    1552. 

  1552. +	u_int8_t 	userData[2];
    1553. 

  1553. +}PACKED_S;
    1554. 

  1554. +typedef struct HFSPlusAttrInlineData HFSPlusAttrInlineData;
    1555. 

  1555. +
    1556. 

  1556. +
    1557. 

  1557. +/*	A generic Attribute Record*/
    1558. 

  1558. +union HFSPlusAttrRecord {
    1559. 

  1559. +	u_int32_t 		recordType;
    1560. 

  1560. +	HFSPlusAttrInlineData 	inlineData;   /* NOT USED */
    1561. 

  1561. +	HFSPlusAttrData 	attrData;
    1562. 

  1562. +	HFSPlusAttrForkData 	forkData;
    1563. 

  1563. +	HFSPlusAttrExtents 	overflowExtents;
    1564. 

  1564. +}PACKED_S;
    1565. 

  1565. +typedef union HFSPlusAttrRecord HFSPlusAttrRecord;
    1566. 

  1566. +
    1567. 

  1567. +/* Attribute key */
    1568. 

  1568. +enum { kHFSMaxAttrNameLen = 127 };
    1569. 

  1569. +struct HFSPlusAttrKey {
    1570. 

  1570. +	u_int16_t     keyLength;       /* key length (in bytes) */
    1571. 

  1571. +	u_int16_t     pad;	       /* set to zero */
    1572. 

  1572. +	u_int32_t     fileID;          /* file associated with attribute */
    1573. 

  1573. +	u_int32_t     startBlock;      /* first attribue allocation block number for extents */
    1574. 

  1574. +	u_int16_t     attrNameLen;     /* number of unicode characters */
    1575. 

  1575. +	u_int16_t     attrName[127];   /* attribute name (Unicode) */
    1576. 

  1576. +}PACKED_S;
    1577. 

  1577. +typedef struct HFSPlusAttrKey HFSPlusAttrKey;
    1578. 

  1578. +
    1579. 

  1579. +#define kHFSPlusAttrKeyMaximumLength   (sizeof(HFSPlusAttrKey) - sizeof(u_int16_t))
    1580. 

  1580. +#define kHFSPlusAttrKeyMinimumLength   (kHFSPlusAttrKeyMaximumLength - (127 * sizeof(u_int16_t)))
    1581. 

  1581. +
    1582. 

  1582. +#endif /* __APPLE_API_UNSTABLE */
    1583. 

  1583. +
    1584. 

  1584. +
    1585. 

  1585. +/* Key and node lengths */
    1586. 

  1586. +enum {
    1587. 

  1587. +	kHFSPlusExtentKeyMaximumLength = sizeof(HFSPlusExtentKey) - sizeof(u_int16_t),
    1588. 

  1588. +	kHFSExtentKeyMaximumLength	= sizeof(HFSExtentKey) - sizeof(u_int8_t),
    1589. 

  1589. +	kHFSPlusCatalogKeyMaximumLength = sizeof(HFSPlusCatalogKey) - sizeof(u_int16_t),
    1590. 

  1590. +	kHFSPlusCatalogKeyMinimumLength = kHFSPlusCatalogKeyMaximumLength - sizeof(HFSUniStr255) + sizeof(u_int16_t),
    1591. 

  1591. +	kHFSCatalogKeyMaximumLength	= sizeof(HFSCatalogKey) - sizeof(u_int8_t),
    1592. 

  1592. +	kHFSCatalogKeyMinimumLength	= kHFSCatalogKeyMaximumLength - (kHFSMaxFileNameChars + 1) + sizeof(u_int8_t),
    1593. 

  1593. +	kHFSPlusCatalogMinNodeSize	= 4096,
    1594. 

  1594. +	kHFSPlusExtentMinNodeSize	= 512,
    1595. 

  1595. +	kHFSPlusAttrMinNodeSize		= 4096
    1596. 

  1596. +}PACKED_S;
    1597. 

  1597. +
    1598. 

  1598. +/* HFS and HFS Plus volume attribute bits */
    1599. 

  1599. +enum {
    1600. 

  1600. +							/* Bits 0-6 are reserved (always cleared by MountVol call) */
    1601. 

  1601. +	kHFSVolumeHardwareLockBit	= 7,		/* volume is locked by hardware */
    1602. 

  1602. +	kHFSVolumeUnmountedBit		= 8,		/* volume was successfully unmounted */
    1603. 

  1603. +	kHFSVolumeSparedBlocksBit	= 9,		/* volume has bad blocks spared */
    1604. 

  1604. +	kHFSVolumeNoCacheRequiredBit = 10,		/* don't cache volume blocks (i.e. RAM or ROM disk) */
    1605. 

  1605. +	kHFSBootVolumeInconsistentBit = 11,		/* boot volume is inconsistent (System 7.6 and later) */
    1606. 

  1606. +	kHFSCatalogNodeIDsReusedBit = 12,
    1607. 

  1607. +	kHFSVolumeJournaledBit = 13,			/* this volume has a journal on it */
    1608. 

  1608. +	kHFSVolumeInconsistentBit = 14,			/* serious inconsistencies detected at runtime */
    1609. 

  1609. +	kHFSVolumeSoftwareLockBit	= 15,		/* volume is locked by software */
    1610. 

  1610. +
    1611. 

  1611. +	kHFSVolumeHardwareLockMask	= 1 << kHFSVolumeHardwareLockBit,
    1612. 

  1612. +	kHFSVolumeUnmountedMask		= 1 << kHFSVolumeUnmountedBit,
    1613. 

  1613. +	kHFSVolumeSparedBlocksMask	= 1 << kHFSVolumeSparedBlocksBit,
    1614. 

  1614. +	kHFSVolumeNoCacheRequiredMask = 1 << kHFSVolumeNoCacheRequiredBit,
    1615. 

  1615. +	kHFSBootVolumeInconsistentMask = 1 << kHFSBootVolumeInconsistentBit,
    1616. 

  1616. +	kHFSCatalogNodeIDsReusedMask = 1 << kHFSCatalogNodeIDsReusedBit,
    1617. 

  1617. +	kHFSVolumeJournaledMask	= 1 << kHFSVolumeJournaledBit,
    1618. 

  1618. +	kHFSVolumeInconsistentMask = 1 << kHFSVolumeInconsistentBit,
    1619. 

  1619. +	kHFSVolumeSoftwareLockMask	= 1 << kHFSVolumeSoftwareLockBit,
    1620. 

  1620. +	kHFSMDBAttributesMask		= 0x8380
    1621. 

  1621. +}PACKED_S;
    1622. 

  1622. +
    1623. 

  1623. +
    1624. 

  1624. +/* HFS Master Directory Block - 162 bytes */
    1625. 

  1625. +/* Stored at sector #2 (3rd sector) and second-to-last sector. */
    1626. 

  1626. +struct HFSMasterDirectoryBlock {
    1627. 

  1627. +	u_int16_t 		drSigWord;	/* == kHFSSigWord */
    1628. 

  1628. +	u_int32_t 		drCrDate;	/* date and time of volume creation */
    1629. 

  1629. +	u_int32_t 		drLsMod;	/* date and time of last modification */
    1630. 

  1630. +	u_int16_t 		drAtrb;		/* volume attributes */
    1631. 

  1631. +	u_int16_t 		drNmFls;	/* number of files in root folder */
    1632. 

  1632. +	u_int16_t 		drVBMSt;	/* first block of volume bitmap */
    1633. 

  1633. +	u_int16_t 		drAllocPtr;	/* start of next allocation search */
    1634. 

  1634. +	u_int16_t 		drNmAlBlks;	/* number of allocation blocks in volume */
    1635. 

  1635. +	u_int32_t 		drAlBlkSiz;	/* size (in bytes) of allocation blocks */
    1636. 

  1636. +	u_int32_t 		drClpSiz;	/* default clump size */
    1637. 

  1637. +	u_int16_t 		drAlBlSt;	/* first allocation block in volume */
    1638. 

  1638. +	u_int32_t 		drNxtCNID;	/* next unused catalog node ID */
    1639. 

  1639. +	u_int16_t 		drFreeBks;	/* number of unused allocation blocks */
    1640. 

  1640. +	u_int8_t 		drVN[kHFSMaxVolumeNameChars + 1];  /* volume name */
    1641. 

  1641. +	u_int32_t 		drVolBkUp;	/* date and time of last backup */
    1642. 

  1642. +	u_int16_t 		drVSeqNum;	/* volume backup sequence number */
    1643. 

  1643. +	u_int32_t 		drWrCnt;	/* volume write count */
    1644. 

  1644. +	u_int32_t 		drXTClpSiz;	/* clump size for extents overflow file */
    1645. 

  1645. +	u_int32_t 		drCTClpSiz;	/* clump size for catalog file */
    1646. 

  1646. +	u_int16_t 		drNmRtDirs;	/* number of directories in root folder */
    1647. 

  1647. +	u_int32_t 		drFilCnt;	/* number of files in volume */
    1648. 

  1648. +	u_int32_t 		drDirCnt;	/* number of directories in volume */
    1649. 

  1649. +	u_int32_t 		drFndrInfo[8];	/* information used by the Finder */
    1650. 

  1650. +	u_int16_t 		drEmbedSigWord;	/* embedded volume signature (formerly drVCSize) */
    1651. 

  1651. +	HFSExtentDescriptor	drEmbedExtent;	/* embedded volume location and size (formerly drVBMCSize and drCtlCSize) */
    1652. 

  1652. +	u_int32_t		drXTFlSize;	/* size of extents overflow file */
    1653. 

  1653. +	HFSExtentRecord		drXTExtRec;	/* extent record for extents overflow file */
    1654. 

  1654. +	u_int32_t 		drCTFlSize;	/* size of catalog file */
    1655. 

  1655. +	HFSExtentRecord 	drCTExtRec;	/* extent record for catalog file */
    1656. 

  1656. +}PACKED_S;
    1657. 

  1657. +typedef struct HFSMasterDirectoryBlock	HFSMasterDirectoryBlock;
    1658. 

  1658. +
    1659. 

  1659. +
    1660. 

  1660. +#ifdef __APPLE_API_UNSTABLE
    1661. 

  1661. +#define SET_HFS_TEXT_ENCODING(hint)  \
    1662. 

  1662. +	(0x656e6300 | ((hint) & 0xff))
    1663. 

  1663. +#define GET_HFS_TEXT_ENCODING(hint)  \
    1664. 

  1664. +	(((hint) & 0xffffff00) == 0x656e6300 ? (hint) & 0x000000ff : 0xffffffffU)
    1665. 

  1665. +#endif /* __APPLE_API_UNSTABLE */
    1666. 

  1666. +
    1667. 

  1667. +
    1668. 

  1668. +/* HFS Plus Volume Header - 512 bytes */
    1669. 

  1669. +/* Stored at sector #2 (3rd sector) and second-to-last sector. */
    1670. 

  1670. +struct HFSPlusVolumeHeader {
    1671. 

  1671. +	u_int16_t 	signature;		/* == kHFSPlusSigWord */
    1672. 

  1672. +	u_int16_t 	version;		/* == kHFSPlusVersion */
    1673. 

  1673. +	u_int32_t 	attributes;		/* volume attributes */
    1674. 

  1674. +	u_int32_t 	lastMountedVersion;	/* implementation version which last mounted volume */
    1675. 

  1675. +	u_int32_t 	journalInfoBlock;	/* block addr of journal info (if volume is journaled, zero otherwise) */
    1676. 

  1676. +
    1677. 

  1677. +	u_int32_t 	createDate;		/* date and time of volume creation */
    1678. 

  1678. +	u_int32_t 	modifyDate;		/* date and time of last modification */
    1679. 

  1679. +	u_int32_t 	backupDate;		/* date and time of last backup */
    1680. 

  1680. +	u_int32_t 	checkedDate;		/* date and time of last disk check */
    1681. 

  1681. +
    1682. 

  1682. +	u_int32_t 	fileCount;		/* number of files in volume */
    1683. 

  1683. +	u_int32_t 	folderCount;		/* number of directories in volume */
    1684. 

  1684. +
    1685. 

  1685. +	u_int32_t 	blockSize;		/* size (in bytes) of allocation blocks */
    1686. 

  1686. +	u_int32_t 	totalBlocks;		/* number of allocation blocks in volume (includes this header and VBM*/
    1687. 

  1687. +	u_int32_t 	freeBlocks;		/* number of unused allocation blocks */
    1688. 

  1688. +
    1689. 

  1689. +	u_int32_t 	nextAllocation;		/* start of next allocation search */
    1690. 

  1690. +	u_int32_t 	rsrcClumpSize;		/* default resource fork clump size */
    1691. 

  1691. +	u_int32_t 	dataClumpSize;		/* default data fork clump size */
    1692. 

  1692. +	u_int32_t 	nextCatalogID;		/* next unused catalog node ID */
    1693. 

  1693. +
    1694. 

  1694. +	u_int32_t 	writeCount;		/* volume write count */
    1695. 

  1695. +	u_int64_t 	encodingsBitmap;	/* which encodings have been use  on this volume */
    1696. 

  1696. +
    1697. 

  1697. +	u_int8_t 	finderInfo[32];		/* information used by the Finder */
    1698. 

  1698. +
    1699. 

  1699. +	HFSPlusForkData	 allocationFile;	/* allocation bitmap file */
    1700. 

  1700. +	HFSPlusForkData  extentsFile;		/* extents B-tree file */
    1701. 

  1701. +	HFSPlusForkData  catalogFile;		/* catalog B-tree file */
    1702. 

  1702. +	HFSPlusForkData  attributesFile;	/* extended attributes B-tree file */
    1703. 

  1703. +	HFSPlusForkData	 startupFile;		/* boot file (secondary loader) */
    1704. 

  1704. +}PACKED_S;
    1705. 

  1705. +typedef struct HFSPlusVolumeHeader HFSPlusVolumeHeader;
    1706. 

  1706. +
    1707. 

  1707. +
    1708. 

  1708. +/* B-tree structures */
    1709. 

  1709. +
    1710. 

  1710. +enum BTreeKeyLimits{
    1711. 

  1711. +	kMaxKeyLength	= 520
    1712. 

  1712. +}PACKED_S;
    1713. 

  1713. +
    1714. 

  1714. +union BTreeKey{
    1715. 

  1715. +	u_int8_t	length8;
    1716. 

  1716. +	u_int16_t	length16;
    1717. 

  1717. +	u_int8_t	rawData [kMaxKeyLength+2];
    1718. 

  1718. +}PACKED_S;
    1719. 

  1719. +typedef union BTreeKey BTreeKey;
    1720. 

  1720. +
    1721. 

  1721. +/* BTNodeDescriptor -- Every B-tree node starts with these fields. */
    1722. 

  1722. +struct BTNodeDescriptor {
    1723. 

  1723. +	u_int32_t	fLink;			/* next node at this level*/
    1724. 

  1724. +	u_int32_t 	bLink;			/* previous node at this level*/
    1725. 

  1725. +	int8_t 		kind;			/* kind of node (leaf, index, header, map)*/
    1726. 

  1726. +	u_int8_t 	height;			/* zero for header, map; child is one more than parent*/
    1727. 

  1727. +	u_int16_t 	numRecords;		/* number of records in this node*/
    1728. 

  1728. +	u_int16_t 	reserved;		/* reserved - initialized as zero */
    1729. 

  1729. +}PACKED_S;
    1730. 

  1730. +typedef struct BTNodeDescriptor BTNodeDescriptor;
    1731. 

  1731. +
    1732. 

  1732. +/* Constants for BTNodeDescriptor kind */
    1733. 

  1733. +enum {
    1734. 

  1734. +	kBTLeafNode	= -1,
    1735. 

  1735. +	kBTIndexNode	= 0,
    1736. 

  1736. +	kBTHeaderNode	= 1,
    1737. 

  1737. +	kBTMapNode	= 2
    1738. 

  1738. +}PACKED_S;
    1739. 

  1739. +
    1740. 

  1740. +/* BTHeaderRec -- The first record of a B-tree header node */
    1741. 

  1741. +struct BTHeaderRec {
    1742. 

  1742. +	u_int16_t	treeDepth;		/* maximum height (usually leaf nodes) */
    1743. 

  1743. +	u_int32_t 	rootNode;		/* node number of root node */
    1744. 

  1744. +	u_int32_t 	leafRecords;		/* number of leaf records in all leaf nodes */
    1745. 

  1745. +	u_int32_t 	firstLeafNode;		/* node number of first leaf node */
    1746. 

  1746. +	u_int32_t 	lastLeafNode;		/* node number of last leaf node */
    1747. 

  1747. +	u_int16_t 	nodeSize;		/* size of a node, in bytes */
    1748. 

  1748. +	u_int16_t 	maxKeyLength;		/* reserved */
    1749. 

  1749. +	u_int32_t 	totalNodes;		/* total number of nodes in tree */
    1750. 

  1750. +	u_int32_t 	freeNodes;		/* number of unused (free) nodes in tree */
    1751. 

  1751. +	u_int16_t 	reserved1;		/* unused */
    1752. 

  1752. +	u_int32_t 	clumpSize;		/* reserved */
    1753. 

  1753. +	u_int8_t 	btreeType;		/* reserved */
    1754. 

  1754. +	u_int8_t 	keyCompareType;		/* Key string Comparison Type */
    1755. 

  1755. +	u_int32_t 	attributes;		/* persistent attributes about the tree */
    1756. 

  1756. +	u_int32_t 	reserved3[16];		/* reserved */
    1757. 

  1757. +}PACKED_S;
    1758. 

  1758. +typedef struct BTHeaderRec BTHeaderRec;
    1759. 

  1759. +
    1760. 

  1760. +/* Constants for BTHeaderRec attributes */
    1761. 

  1761. +enum {
    1762. 

  1762. +	kBTBadCloseMask		 = 0x00000001,	/* reserved */
    1763. 

  1763. +	kBTBigKeysMask		 = 0x00000002,	/* key length field is 16 bits */
    1764. 

  1764. +	kBTVariableIndexKeysMask = 0x00000004	/* keys in index nodes are variable length */
    1765. 

  1765. +}PACKED_S;
    1766. 

  1766. +
    1767. 

  1767. +
    1768. 

  1768. +/* Catalog Key Name Comparison Type */
    1769. 

  1769. +enum {
    1770. 

  1770. +	kHFSCaseFolding   = 0xCF,  /* case folding (case-insensitive) */
    1771. 

  1771. +	kHFSBinaryCompare = 0xBC  /* binary compare (case-sensitive) */
    1772. 

  1772. +}PACKED_S;
    1773. 

  1773. +
    1774. 

  1774. +/* JournalInfoBlock - Structure that describes where our journal lives */
    1775. 

  1775. +struct JournalInfoBlock {
    1776. 

  1776. +	u_int32_t	flags;
    1777. 

  1777. +    	u_int32_t       device_signature[8];  // signature used to locate our device.
    1778. 

  1778. +	u_int64_t       offset;               // byte offset to the journal on the device
    1779. 

  1779. +	u_int64_t       size;                 // size in bytes of the journal
    1780. 

  1780. +	u_int32_t 	reserved[32];
    1781. 

  1781. +}PACKED_S;
    1782. 

  1782. +typedef struct JournalInfoBlock JournalInfoBlock;
    1783. 

  1783. +
    1784. 

  1784. +enum {
    1785. 

  1785. +    kJIJournalInFSMask          = 0x00000001,
    1786. 

  1786. +    kJIJournalOnOtherDeviceMask = 0x00000002,
    1787. 

  1787. +    kJIJournalNeedInitMask      = 0x00000004
    1788. 

  1788. +}PACKED_S;
    1789. 

  1789. +
    1790. 

  1790. +#ifdef __cplusplus
    1791. 

  1791. +}
    1792. 

  1792. +#endif
    1793. 

  1793. +
    1794. 

  1794. +#endif /* __HFS_FORMAT__ */
    1795. 

  1795. diff -druN diskdev_cmds-332.14/include/hfs/hfs_mount.h diskdev_cmds-332.14-patched/include/hfs/hfs_mount.h
    1796. 

  1796. --- diskdev_cmds-332.14/include/hfs/hfs_mount.h	1970-01-01 01:00:00.000000000 +0100
    1797. 

  1797. +++ diskdev_cmds-332.14-patched/include/hfs/hfs_mount.h	2008-07-01 22:30:11.000000000 +0200
    1798. 

  1798. @@ -0,0 +1,78 @@
    1799. 

  1799. +/*
    1800. 

  1800. + * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
    1801. 

  1801. + *
    1802. 

  1802. + * @APPLE_LICENSE_HEADER_START@
    1803. 

  1803. + * 
    1804. 

  1804. + * The contents of this file constitute Original Code as defined in and
    1805. 

  1805. + * are subject to the Apple Public Source License Version 1.1 (the
    1806. 

  1806. + * "License").  You may not use this file except in compliance with the
    1807. 

  1807. + * License.  Please obtain a copy of the License at
    1808. 

  1808. + * http://www.apple.com/publicsource and read it before using this file.
    1809. 

  1809. + * 
    1810. 

  1810. + * This Original Code and all software distributed under the License are
    1811. 

  1811. + * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
    1812. 

  1812. + * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
    1813. 

  1813. + * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
    1814. 

  1814. + * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
    1815. 

  1815. + * License for the specific language governing rights and limitations
    1816. 

  1816. + * under the License.
    1817. 

  1817. + * 
    1818. 

  1818. + * @APPLE_LICENSE_HEADER_END@
    1819. 

  1819. + */
    1820. 

  1820. +/*
    1821. 

  1821. + * Copyright (c) 1997-2002 Apple Computer, Inc. All Rights Reserved
    1822. 

  1822. + *
    1823. 

  1823. + */
    1824. 

  1824. +
    1825. 

  1825. +#ifndef _HFS_MOUNT_H_
    1826. 

  1826. +#define _HFS_MOUNT_H_
    1827. 

  1827. +
    1828. 

  1828. +#include <sys/appleapiopts.h>
    1829. 

  1829. +
    1830. 

  1830. +#include <sys/mount.h>
    1831. 

  1831. +#include <sys/time.h>
    1832. 

  1832. +
    1833. 

  1833. +/*
    1834. 

  1834. + * Arguments to mount HFS-based filesystems
    1835. 

  1835. + */
    1836. 

  1836. +
    1837. 

  1837. +#define OVERRIDE_UNKNOWN_PERMISSIONS 0
    1838. 

  1838. +
    1839. 

  1839. +#define UNKNOWNUID ((uid_t)99)
    1840. 

  1840. +#define UNKNOWNGID ((gid_t)99)
    1841. 

  1841. +#define UNKNOWNPERMISSIONS (S_IRWXU | S_IROTH | S_IXOTH)		/* 705 */
    1842. 

  1842. +
    1843. 

  1843. +#ifdef __APPLE_API_UNSTABLE
    1844. 

  1844. +struct hfs_mount_args {
    1845. 

  1845. +#ifndef KERNEL
    1846. 

  1846. +	char	*fspec;			/* block special device to mount */
    1847. 

  1847. +#endif
    1848. 

  1848. +	uid_t	hfs_uid;		/* uid that owns hfs files (standard HFS only) */
    1849. 

  1849. +	gid_t	hfs_gid;		/* gid that owns hfs files (standard HFS only) */
    1850. 

  1850. +	mode_t	hfs_mask;		/* mask to be applied for hfs perms  (standard HFS only) */
    1851. 

  1851. +	u_int32_t hfs_encoding;		/* encoding for this volume (standard HFS only) */
    1852. 

  1852. +	struct	timezone hfs_timezone;	/* user time zone info (standard HFS only) */
    1853. 

  1853. +	int		flags;			/* mounting flags, see below */
    1854. 

  1854. +	int     journal_tbuffer_size;   /* size in bytes of the journal transaction buffer */
    1855. 

  1855. +	int		journal_flags;          /* flags to pass to journal_open/create */
    1856. 

  1856. +	int		journal_disable;        /* don't use journaling (potentially dangerous) */
    1857. 

  1857. +};
    1858. 

  1858. +
    1859. 

  1859. +#define HFSFSMNT_NOXONFILES	0x1	/* disable execute permissions for files */
    1860. 

  1860. +#define HFSFSMNT_WRAPPER	0x2	/* mount HFS wrapper (if it exists) */
    1861. 

  1861. +#define HFSFSMNT_EXTENDED_ARGS  0x4     /* indicates new fields after "flags" are valid */
    1862. 

  1862. +
    1863. 

  1863. +/*
    1864. 

  1864. + * Sysctl values for HFS
    1865. 

  1865. + */
    1866. 

  1866. +#define HFS_ENCODINGBIAS	1	    /* encoding matching CJK bias */
    1867. 

  1867. +#define HFS_EXTEND_FS		2
    1868. 

  1868. +#define HFS_ENCODINGHINT	3	    /* guess encoding for string */
    1869. 

  1869. +#define HFS_ENABLE_JOURNALING   0x082969
    1870. 

  1870. +#define HFS_DISABLE_JOURNALING  0x031272
    1871. 

  1871. +#define HFS_GET_JOURNAL_INFO    0x6a6e6c69
    1872. 

  1872. +#define HFS_SET_PKG_EXTENSIONS  0x121031
    1873. 

  1873. +
    1874. 

  1874. +#endif /* __APPLE_API_UNSTABLE */
    1875. 

  1875. +
    1876. 

  1876. +#endif /* ! _HFS_MOUNT_H_ */
    1877. 

  1877. diff -druN diskdev_cmds-332.14/include/missing.h diskdev_cmds-332.14-patched/include/missing.h
    1878. 

  1878. --- diskdev_cmds-332.14/include/missing.h	1970-01-01 01:00:00.000000000 +0100
    1879. 

  1879. +++ diskdev_cmds-332.14-patched/include/missing.h	2008-07-01 22:30:11.000000000 +0200
    1880. 

  1880. @@ -0,0 +1,113 @@
    1881. 

  1881. +#ifndef _MISSING_H_
    1882. 

  1882. +#define _MISSING_H_
    1883. 

  1883. +
    1884. 

  1884. +#include <endian.h>
    1885. 

  1885. +#include <byteswap.h>
    1886. 

  1886. +#include <errno.h>
    1887. 

  1887. +#include <stdint.h>
    1888. 

  1888. +
    1889. 

  1889. +#define MAXBSIZE		(256 * 4096)
    1890. 

  1890. +
    1891. 

  1891. +#ifndef true
    1892. 

  1892. +#define true			1
    1893. 

  1893. +#endif
    1894. 

  1894. +#ifndef false
    1895. 

  1895. +#define false			0
    1896. 

  1896. +#endif
    1897. 

  1897. +
    1898. 

  1898. +/* Mac types */
    1899. 

  1899. +
    1900. 

  1900. +/* 8 Bit */
    1901. 

  1901. +#ifndef UInt8
    1902. 

  1902. +#define UInt8			uint8_t
    1903. 

  1903. +#endif
    1904. 

  1904. +#ifndef u_int8_t
    1905. 

  1905. +#define u_int8_t		UInt8
    1906. 

  1906. +#endif
    1907. 

  1907. +#ifndef SInt8
    1908. 

  1908. +#define SInt8			int8_t
    1909. 

  1909. +#endif
    1910. 

  1910. +
    1911. 

  1911. +/* 16 Bit */
    1912. 

  1912. +#ifndef UInt16
    1913. 

  1913. +#define UInt16			uint16_t
    1914. 

  1914. +#endif
    1915. 

  1915. +#ifndef u_int16_t
    1916. 

  1916. +#define u_int16_t		UInt16
    1917. 

  1917. +#endif
    1918. 

  1918. +#ifndef SInt16
    1919. 

  1919. +#define SInt16			int16_t
    1920. 

  1920. +#endif
    1921. 

  1921. +
    1922. 

  1922. +/* 32 Bit */
    1923. 

  1923. +#ifndef UInt32
    1924. 

  1924. +#define UInt32			uint32_t
    1925. 

  1925. +#endif
    1926. 

  1926. +#ifndef u_int32_t
    1927. 

  1927. +#define u_int32_t		UInt32
    1928. 

  1928. +#endif
    1929. 

  1929. +#ifndef SInt32
    1930. 

  1930. +#define SInt32			int32_t
    1931. 

  1931. +#endif
    1932. 

  1932. +
    1933. 

  1933. +/* 64 Bit */
    1934. 

  1934. +#ifndef UInt64
    1935. 

  1935. +#define UInt64			uint64_t
    1936. 

  1936. +#endif
    1937. 

  1937. +#ifndef u_int64_t
    1938. 

  1938. +#define u_int64_t		UInt64
    1939. 

  1939. +#endif
    1940. 

  1940. +#ifndef SInt64
    1941. 

  1941. +#define SInt64			int64_t
    1942. 

  1942. +#endif
    1943. 

  1943. +
    1944. 

  1944. +#define UniChar			u_int16_t
    1945. 

  1945. +#define Boolean			u_int8_t
    1946. 

  1946. +
    1947. 

  1947. +#define UF_NODUMP	0x00000001
    1948. 

  1948. +
    1949. 

  1949. +/* syslimits.h */
    1950. 

  1950. +#define NAME_MAX	255
    1951. 

  1951. +
    1952. 

  1952. +/* Byteswap stuff */
    1953. 

  1953. +#define NXSwapHostLongToBig(x)		cpu_to_be64(x)
    1954. 

  1954. +#define NXSwapBigShortToHost(x) 	be16_to_cpu(x)
    1955. 

  1955. +#define OSSwapBigToHostInt16(x)		be16_to_cpu(x)
    1956. 

  1956. +#define NXSwapBigLongToHost(x)		be32_to_cpu(x)
    1957. 

  1957. +#define OSSwapBigToHostInt32(x)		be32_to_cpu(x)
    1958. 

  1958. +#define NXSwapBigLongLongToHost(x) 	be64_to_cpu(x)
    1959. 

  1959. +#define OSSwapBigToHostInt64(x)		be64_to_cpu(x)
    1960. 

  1960. +
    1961. 

  1961. +#if __BYTE_ORDER == __LITTLE_ENDIAN
    1962. 

  1962. +/* Big Endian Swaps */
    1963. 

  1963. +#ifndef be16_to_cpu
    1964. 

  1964. +#define be16_to_cpu(x) bswap_16(x)
    1965. 

  1965. +#endif
    1966. 

  1966. +#ifndef be32_to_cpu
    1967. 

  1967. +#define be32_to_cpu(x) bswap_32(x)
    1968. 

  1968. +#endif
    1969. 

  1969. +#ifndef be64_to_cpu
    1970. 

  1970. +#define be64_to_cpu(x) bswap_64(x)
    1971. 

  1971. +#endif
    1972. 

  1972. +#ifndef cpu_to_be64
    1973. 

  1973. +#define cpu_to_be64(x) bswap_64(x) 
    1974. 

  1974. +#endif
    1975. 

  1975. +#elif __BYTE_ORDER == __BIG_ENDIAN
    1976. 

  1976. +/* Big endian doesn't swap */
    1977. 

  1977. +#ifndef be16_to_cpu
    1978. 

  1978. +#define be16_to_cpu(x)	(x)
    1979. 

  1979. +#endif
    1980. 

  1980. +#ifndef be32_to_cpu
    1981. 

  1981. +#define be32_to_cpu(x)	(x)
    1982. 

  1982. +#endif
    1983. 

  1983. +#ifndef be64_to_cpu
    1984. 

  1984. +#define be64_to_cpu(x)	(x)
    1985. 

  1985. +#endif
    1986. 

  1986. +#ifndef cpu_to_be64
    1987. 

  1987. +#define cpu_to_be64(x) 	(x)
    1988. 

  1988. +#endif
    1989. 

  1989. +#endif
    1990. 

  1990. +
    1991. 

  1991. +#define KAUTH_FILESEC_XATTR "com.apple.system.Security"
    1992. 

  1992. +
    1993. 

  1993. +#endif
    1994. 

  1994. diff -druN diskdev_cmds-332.14/include/sys/appleapiopts.h diskdev_cmds-332.14-patched/include/sys/appleapiopts.h
    1995. 

  1995. --- diskdev_cmds-332.14/include/sys/appleapiopts.h	1970-01-01 01:00:00.000000000 +0100
    1996. 

  1996. +++ diskdev_cmds-332.14-patched/include/sys/appleapiopts.h	2008-07-01 22:30:11.000000000 +0200
    1997. 

  1997. @@ -0,0 +1,56 @@
    1998. 

  1998. +/*
    1999. 

  1999. + * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
    2000. 

  2000. + *
    2001. 

  2001. + * @APPLE_LICENSE_HEADER_START@
    2002. 

  2002. + * 
    2003. 

  2003. + * The contents of this file constitute Original Code as defined in and
    2004. 

  2004. + * are subject to the Apple Public Source License Version 1.1 (the
    2005. 

  2005. + * "License").  You may not use this file except in compliance with the
    2006. 

  2006. + * License.  Please obtain a copy of the License at
    2007. 

  2007. + * http://www.apple.com/publicsource and read it before using this file.
    2008. 

  2008. + * 
    2009. 

  2009. + * This Original Code and all software distributed under the License are
    2010. 

  2010. + * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
    2011. 

  2011. + * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
    2012. 

  2012. + * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
    2013. 

  2013. + * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
    2014. 

  2014. + * License for the specific language governing rights and limitations
    2015. 

  2015. + * under the License.
    2016. 

  2016. + * 
    2017. 

  2017. + * @APPLE_LICENSE_HEADER_END@
    2018. 

  2018. + */
    2019. 

  2019. +
    2020. 

  2020. +#ifndef __SYS_APPLEAPIOPTS_H__
    2021. 

  2021. +#define __SYS_APPLEAPIOPTS_H__
    2022. 

  2022. +
    2023. 

  2023. +
    2024. 

  2024. +#ifndef __APPLE_API_STANDARD
    2025. 

  2025. +#define __APPLE_API_STANDARD
    2026. 

  2026. +#endif /* __APPLE_API_STANDARD */
    2027. 

  2027. +
    2028. 

  2028. +#ifndef __APPLE_API_STABLE
    2029. 

  2029. +#define __APPLE_API_STABLE
    2030. 

  2030. +#endif /* __APPLE_API_STABLE */
    2031. 

  2031. +
    2032. 

  2032. +#ifndef __APPLE_API_STRICT_CONFORMANCE
    2033. 

  2033. +
    2034. 

  2034. +#ifndef __APPLE_API_EVOLVING
    2035. 

  2035. +#define __APPLE_API_EVOLVING
    2036. 

  2036. +#endif /* __APPLE_API_EVOLVING */
    2037. 

  2037. +
    2038. 

  2038. +#ifndef __APPLE_API_UNSTABLE
    2039. 

  2039. +#define __APPLE_API_UNSTABLE
    2040. 

  2040. +#endif /* __APPLE_API_UNSTABLE */
    2041. 

  2041. +
    2042. 

  2042. +#ifndef __APPLE_API_PRIVATE
    2043. 

  2043. +#define __APPLE_API_PRIVATE
    2044. 

  2044. +#endif /* __APPLE_API_PRIVATE */
    2045. 

  2045. +
    2046. 

  2046. +#ifndef __APPLE_API_OBSOLETE
    2047. 

  2047. +#define __APPLE_API_OBSOLETE
    2048. 

  2048. +#endif /* __APPLE_API_OBSOLETE */
    2049. 

  2049. +
    2050. 

  2050. +#endif /* __APPLE_API_STRICT_CONFORMANCE */
    2051. 

  2051. +
    2052. 

  2052. +#endif /* __SYS_APPLEAPIOPTS_H__ */
    2053. 

  2053. +
    2054. 

  2054. diff -druN diskdev_cmds-332.14/Makefile.lnx diskdev_cmds-332.14-patched/Makefile.lnx
    2055. 

  2055. --- diskdev_cmds-332.14/Makefile.lnx	1970-01-01 01:00:00.000000000 +0100
    2056. 

  2056. +++ diskdev_cmds-332.14-patched/Makefile.lnx	2008-07-01 22:30:11.000000000 +0200
    2057. 

  2057. @@ -0,0 +1,8 @@
    2058. 

  2058. +CC := gcc
    2059. 

  2059. +CFLAGS := -g3 -Wall -I$(PWD)/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1
    2060. 

  2060. +SUBDIRS := newfs_hfs.tproj fsck_hfs.tproj
    2061. 

  2061. +
    2062. 

  2062. +all clean:
    2063. 

  2063. +	for d in $(SUBDIRS); do $(MAKE) -C $$d -f Makefile.lnx $@; done
    2064. 

  2064. +
    2065. 

  2065. +export CC CFLAGS
    2066. 

  2066. diff -druN diskdev_cmds-332.14/newfs_hfs.tproj/hfs_endian.c diskdev_cmds-332.14-patched/newfs_hfs.tproj/hfs_endian.c
    2067. 

  2067. --- diskdev_cmds-332.14/newfs_hfs.tproj/hfs_endian.c	2006-02-20 22:45:15.000000000 +0100
    2068. 

  2068. +++ diskdev_cmds-332.14-patched/newfs_hfs.tproj/hfs_endian.c	2008-07-01 22:30:11.000000000 +0200
    2069. 

  2069. @@ -30,7 +30,12 @@
    2070. 

  2070.  #include <sys/types.h>
    2071. 

  2071.  #include <sys/stat.h>
    2072. 

  2072.  
    2073. 

  2073. +#if LINUX
    2074. 

  2074. +#include "missing.h"
    2075. 

  2075. +#else
    2076. 

  2076.  #include <architecture/byte_order.h>
    2077. 

  2077. +#endif
    2078. 

  2078. +
    2079. 

  2079.  #include <hfs/hfs_format.h>
    2080. 

  2080.  
    2081. 

  2081.  #include "hfs_endian.h"
    2082. 

  2082. diff -druN diskdev_cmds-332.14/newfs_hfs.tproj/hfs_endian.h diskdev_cmds-332.14-patched/newfs_hfs.tproj/hfs_endian.h
    2083. 

  2083. --- diskdev_cmds-332.14/newfs_hfs.tproj/hfs_endian.h	2006-02-20 22:45:15.000000000 +0100
    2084. 

  2084. +++ diskdev_cmds-332.14-patched/newfs_hfs.tproj/hfs_endian.h	2008-07-01 22:30:11.000000000 +0200
    2085. 

  2085. @@ -29,7 +29,12 @@
    2086. 

  2086.   * volume format.
    2087. 

  2087.   */
    2088. 

  2088.  #include <hfs/hfs_format.h>
    2089. 

  2089. +#if LINUX
    2090. 

  2090. +#include <endian.h>
    2091. 

  2091. +#include <byteswap.h>
    2092. 

  2092. +#else
    2093. 

  2093.  #include <architecture/byte_order.h>
    2094. 

  2094. +#endif
    2095. 

  2095.  
    2096. 

  2096.  /*********************/
    2097. 

  2097.  /* BIG ENDIAN Macros */
    2098. 

  2098. Files diskdev_cmds-332.14/newfs_hfs.tproj/hfs_endian.o and diskdev_cmds-332.14-patched/newfs_hfs.tproj/hfs_endian.o differ
    2099. 

  2099. diff -druN diskdev_cmds-332.14/newfs_hfs.tproj/Makefile.lnx diskdev_cmds-332.14-patched/newfs_hfs.tproj/Makefile.lnx
    2100. 

  2100. --- diskdev_cmds-332.14/newfs_hfs.tproj/Makefile.lnx	1970-01-01 01:00:00.000000000 +0100
    2101. 

  2101. +++ diskdev_cmds-332.14-patched/newfs_hfs.tproj/Makefile.lnx	2008-07-01 22:30:11.000000000 +0200
    2102. 

  2102. @@ -0,0 +1,12 @@
    2103. 

  2103. +CFILES = hfs_endian.c makehfs.c newfs_hfs.c
    2104. 

  2104. +OFILES = $(CFILES:.c=.o)
    2105. 

  2105. +
    2106. 

  2106. +all: newfs_hfs
    2107. 

  2107. +
    2108. 

  2108. +newfs_hfs: $(OFILES)
    2109. 

  2109. +	${CC} ${CFLAGS} -o newfs_hfs ${OFILES} -lcrypto
    2110. 

  2110. +
    2111. 

  2111. +clean:
    2112. 

  2112. +	$(RM) newfs_hfs $(OFILES)
    2113. 

  2113. +
    2114. 

  2114. +.PHONY : FORCE clean
    2115. 

  2115. diff -druN diskdev_cmds-332.14/newfs_hfs.tproj/makehfs.c diskdev_cmds-332.14-patched/newfs_hfs.tproj/makehfs.c
    2116. 

  2116. --- diskdev_cmds-332.14/newfs_hfs.tproj/makehfs.c	2006-02-20 22:45:15.000000000 +0100
    2117. 

  2117. +++ diskdev_cmds-332.14-patched/newfs_hfs.tproj/makehfs.c	2008-07-01 22:36:05.000000000 +0200
    2118. 

  2118. @@ -31,10 +31,16 @@
    2119. 

  2119.  #include <sys/param.h>
    2120. 

  2120.  #include <sys/types.h>
    2121. 

  2121.  #include <sys/time.h>
    2122. 

  2122. +#if LINUX
    2123. 

  2123. +#include <time.h>
    2124. 

  2124. +#include "missing.h"
    2125. 

  2125. +#endif
    2126. 

  2126.  #include <sys/errno.h>
    2127. 

  2127.  #include <sys/stat.h>
    2128. 

  2128.  #include <sys/sysctl.h>
    2129. 

  2129. +#if !LINUX
    2130. 

  2130.  #include <sys/vmmeter.h>
    2131. 

  2131. +#endif
    2132. 

  2132.  
    2133. 

  2133.  #include <err.h>
    2134. 

  2134.  #include <errno.h>
    2135. 

  2135. @@ -47,13 +53,14 @@
    2136. 

  2136.  
    2137. 

  2137.  #include <openssl/sha.h>
    2138. 

  2138.  
    2139. 

  2139. +#if !LINUX
    2140. 

  2140.  #include <architecture/byte_order.h>
    2141. 

  2141.  
    2142. 

  2142.  #include <CoreFoundation/CFString.h>
    2143. 

  2143.  #include <CoreFoundation/CFStringEncodingExt.h>
    2144. 

  2144.  
    2145. 

  2145.  extern Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8 *buffer, CFIndex maxBufLen);
    2146. 

  2146. -
    2147. 

  2147. +#endif
    2148. 

  2148.  
    2149. 

  2149.  #include <hfs/hfs_format.h>
    2150. 

  2150.  #include <hfs/hfs_mount.h>
    2151. 

  2151. @@ -63,7 +70,7 @@
    2152. 

  2152.  #include "readme.h"
    2153. 

  2153.  
    2154. 

  2154.  
    2155. 

  2155. -#define HFS_BOOT_DATA	"/usr/share/misc/hfsbootdata"
    2156. 

  2156. +#define HFS_BOOT_DATA	"/usr/share/hfsprogs/hfsbootdata"
    2157. 

  2157.  
    2158. 

  2158.  #define HFS_JOURNAL_FILE	".journal"
    2159. 

  2159.  #define HFS_JOURNAL_INFO	".journal_info_block"
    2160. 

  2160. @@ -129,7 +136,9 @@
    2161. 

  2161.  static void MarkBitInAllocationBuffer __P((HFSPlusVolumeHeader *header,
    2162. 

  2162.  		UInt32 allocationBlock, void* sectorBuffer, UInt32 *sector));
    2163. 

  2163.  
    2164. 

  2164. +#if !LINUX
    2165. 

  2165.  static UInt32 GetDefaultEncoding();
    2166. 

  2166. +#endif
    2167. 

  2167.  
    2168. 

  2168.  static UInt32 UTCToLocal __P((UInt32 utcTime));
    2169. 

  2169.  
    2170. 

  2170. @@ -158,11 +167,14 @@
    2171. 

  2171.  
    2172. 

  2172.  #define ROUNDUP(x, u)	(((x) % (u) == 0) ? (x) : ((x)/(u) + 1) * (u))
    2173. 

  2173.  
    2174. 

  2174. -#define ENCODING_TO_BIT(e)                               \
    2175. 

  2175. +#if LINUX
    2176. 

  2176. +#define ENCODING_TO_BIT(e)       (e)                    
    2177. 

  2177. +#else
    2178. 

  2178. +#define ENCODING_TO_BIT(e)
    2179. 

  2179.            ((e) < 48 ? (e) :                              \
    2180. 

  2180.            ((e) == kCFStringEncodingMacUkrainian ? 48 :   \
    2181. 

  2181.            ((e) == kCFStringEncodingMacFarsi ? 49 : 0)))
    2182. 

  2182. -
    2183. 

  2183. +#endif
    2184. 

  2184.  /*
    2185. 

  2185.   * make_hfs
    2186. 

  2186.   *	
    2187. 

  2187. @@ -528,6 +540,7 @@
    2188. 

  2188.  	 * Map UTF-8 input into a Mac encoding.
    2189. 

  2189.  	 * On conversion errors "untitled" is used as a fallback.
    2190. 

  2190.  	 */
    2191. 

  2191. +#if !LINUX
    2192. 

  2192.  	{
    2193. 

  2193.  		UniChar unibuf[kHFSMaxVolumeNameChars];
    2194. 

  2194.  		CFStringRef cfstr;
    2195. 

  2195. @@ -553,7 +566,11 @@
    2196. 

  2196.  		bcopy(&mdbp->drVN[1], defaults->volumeName, mdbp->drVN[0]);
    2197. 

  2197.  		defaults->volumeName[mdbp->drVN[0]] = '\0';
    2198. 

  2198.  	}
    2199. 

  2199. +#endif
    2200. 

  2200.  	/* Save the encoding hint in the Finder Info (field 4). */
    2201. 

  2201. +	mdbp->drVN[0] = strlen(defaults->volumeName);
    2202. 

  2202. +	bcopy(defaults->volumeName,&mdbp->drVN[1],mdbp->drVN[0]);
    2203. 

  2203. +	
    2204. 

  2204.  	mdbp->drFndrInfo[4] = SET_HFS_TEXT_ENCODING(defaults->encodingHint);
    2205. 

  2205.  
    2206. 

  2206.  	mdbp->drWrCnt = kWriteSeqNum;
    2207. 

  2207. @@ -1100,9 +1117,11 @@
    2208. 

  2208.  	UInt16					nodeSize;
    2209. 

  2209.  	SInt16					offset;
    2210. 

  2210.  	UInt32					unicodeBytes;
    2211. 

  2211. +#if !LINUX
    2212. 

  2212.  	UInt8 canonicalName[256];
    2213. 

  2213.  	CFStringRef cfstr;
    2214. 

  2214.  	Boolean	cfOK;
    2215. 

  2215. +#endif
    2216. 

  2216.  	int index = 0;
    2217. 

  2217.  
    2218. 

  2218.  	nodeSize = dp->catalogNodeSize;
    2219. 

  2219. @@ -1122,7 +1141,9 @@
    2220. 

  2220.  	 * First record is always the root directory...
    2221. 

  2221.  	 */
    2222. 

  2222.  	ckp = (HFSPlusCatalogKey *)((UInt8 *)buffer + offset);
    2223. 

  2223. -	
    2224. 

  2224. +#if LINUX	
    2225. 

  2225. +	ConvertUTF8toUnicode(dp->volumeName, sizeof(ckp->nodeName.unicode), ckp->nodeName.unicode, &ckp->nodeName.length);
    2226. 

  2226. +#else
    2227. 

  2227.  	/* Use CFString functions to get a HFSPlus Canonical name */
    2228. 

  2228.  	cfstr = CFStringCreateWithCString(kCFAllocatorDefault, (char *)dp->volumeName, kCFStringEncodingUTF8);
    2229. 

  2229.  	cfOK = _CFStringGetFileSystemRepresentation(cfstr, canonicalName, sizeof(canonicalName));
    2230. 

  2230. @@ -1139,6 +1160,7 @@
    2231. 

  2231.  		      dp->volumeName, kDefaultVolumeNameStr);
    2232. 

  2232.  	}
    2233. 

  2233.  	CFRelease(cfstr);
    2234. 

  2234. +#endif
    2235. 

  2235.  	ckp->nodeName.length = SWAP_BE16 (ckp->nodeName.length);
    2236. 

  2236.  
    2237. 

  2237.  	unicodeBytes = sizeof(UniChar) * SWAP_BE16 (ckp->nodeName.length);
    2238. 

  2238. @@ -1821,15 +1843,15 @@
    2239. 

  2239.  	off_t sector;
    2240. 

  2240.  
    2241. 

  2241.  	if ((byteCount % driveInfo->sectorSize) != 0)
    2242. 

  2242. -		errx(1, "WriteBuffer: byte count %ld is not sector size multiple", byteCount);
    2243. 

  2243. +		errx(1, "WriteBuffer: byte count %i is not sector size multiple", byteCount);
    2244. 

  2244.  
    2245. 

  2245.  	sector = driveInfo->sectorOffset + startingSector;
    2246. 

  2246.  
    2247. 

  2247.  	if (lseek(driveInfo->fd, sector * driveInfo->sectorSize, SEEK_SET) < 0)
    2248. 

  2248. -		err(1, "seek (sector %qd)", sector);
    2249. 

  2249. +		err(1, "seek (sector %lld)", sector);
    2250. 

  2250.  
    2251. 

  2251.  	if (write(driveInfo->fd, buffer, byteCount) != byteCount)
    2252. 

  2252. -		err(1, "write (sector %qd, %ld bytes)", sector, byteCount);
    2253. 

  2253. +		err(1, "write (sector %lld, %i bytes)", sector, byteCount);
    2254. 

  2254.  }
    2255. 

  2255.  
    2256. 

  2256.  
    2257. 

  2257. @@ -1913,7 +1935,7 @@
    2258. 

  2258.  	return quotient;
    2259. 

  2259.  }
    2260. 

  2260.  
    2261. 

  2261. -
    2262. 

  2262. +#if !LINUX
    2263. 

  2263.  #define __kCFUserEncodingFileName ("/.CFUserTextEncoding")
    2264. 

  2264.  
    2265. 

  2265.  static UInt32
    2266. 

  2266. @@ -1939,7 +1961,7 @@
    2267. 

  2267.      }
    2268. 

  2268.      return 0;
    2269. 

  2269.  }
    2270. 

  2270. -
    2271. 

  2271. +#endif
    2272. 

  2272.  
    2273. 

  2273.  static int
    2274. 

  2274.  ConvertUTF8toUnicode(const UInt8* source, UInt32 bufsize, UniChar* unibuf,
    2275. 

  2275. @@ -2006,6 +2028,9 @@
    2276. 

  2276.  static int
    2277. 

  2277.  getencodinghint(unsigned char *name)
    2278. 

  2278.  {
    2279. 

  2279. +#if LINUX
    2280. 

  2280. +	return(0);
    2281. 

  2281. +#else
    2282. 

  2282.          int mib[3];
    2283. 

  2283.          size_t buflen = sizeof(int);
    2284. 

  2284.          struct vfsconf vfc;
    2285. 

  2285. @@ -2023,7 +2048,8 @@
    2286. 

  2286.  	return (hint);
    2287. 

  2287.  error:
    2288. 

  2288.  	hint = GetDefaultEncoding();
    2289. 

  2289. -	return (hint);
    2290. 

  2290. +	return (0);
    2291. 

  2291. +#endif
    2292. 

  2292.  }
    2293. 

  2293.  
    2294. 

  2294.  
    2295. 

  2295. @@ -2034,12 +2060,14 @@
    2296. 

  2296.  	unsigned char digest[20];
    2297. 

  2297.  	time_t now;
    2298. 

  2298.  	clock_t uptime;
    2299. 

  2299. -	int mib[2];
    2300. 

  2300. -	int sysdata;
    2301. 

  2301. -	char sysctlstring[128];
    2302. 

  2302.  	size_t datalen;
    2303. 

  2303.  	double sysloadavg[3];
    2304. 

  2304. +#if !LINUX
    2305. 

  2305. +	int sysdata;
    2306. 

  2306. +	int mib[2];
    2307. 

  2307. +	char sysctlstring[128];
    2308. 

  2308.  	struct vmtotal sysvmtotal;
    2309. 

  2309. +#endif
    2310. 

  2310.  	
    2311. 

  2311.  	do {
    2312. 

  2312.  		/* Initialize the SHA-1 context for processing: */
    2313. 

  2313. @@ -2052,52 +2080,58 @@
    2314. 

  2314.  		SHA1_Update(&context, &uptime, sizeof(uptime));
    2315. 

  2315.  		
    2316. 

  2316.  		/* The kernel's boot time: */
    2317. 

  2317. +#if !LINUX
    2318. 

  2318.  		mib[0] = CTL_KERN;
    2319. 

  2319.  		mib[1] = KERN_BOOTTIME;
    2320. 

  2320.  		datalen = sizeof(sysdata);
    2321. 

  2321.  		sysctl(mib, 2, &sysdata, &datalen, NULL, 0);
    2322. 

  2322.  		SHA1_Update(&context, &sysdata, datalen);
    2323. 

  2323. -		
    2324. 

  2324. +#endif
    2325. 

  2325.  		/* The system's host id: */
    2326. 

  2326. +#if !LINUX
    2327. 

  2327.  		mib[0] = CTL_KERN;
    2328. 

  2328.  		mib[1] = KERN_HOSTID;
    2329. 

  2329.  		datalen = sizeof(sysdata);
    2330. 

  2330.  		sysctl(mib, 2, &sysdata, &datalen, NULL, 0);
    2331. 

  2331.  		SHA1_Update(&context, &sysdata, datalen);
    2332. 

  2332. -
    2333. 

  2333. +#endif
    2334. 

  2334.  		/* The system's host name: */
    2335. 

  2335. +#if !LINUX
    2336. 

  2336.  		mib[0] = CTL_KERN;
    2337. 

  2337.  		mib[1] = KERN_HOSTNAME;
    2338. 

  2338.  		datalen = sizeof(sysctlstring);
    2339. 

  2339.  		sysctl(mib, 2, sysctlstring, &datalen, NULL, 0);
    2340. 

  2340.  		SHA1_Update(&context, sysctlstring, datalen);
    2341. 

  2341. -
    2342. 

  2342. +#endif
    2343. 

  2343.  		/* The running kernel's OS release string: */
    2344. 

  2344. +#if !LINUX
    2345. 

  2345.  		mib[0] = CTL_KERN;
    2346. 

  2346.  		mib[1] = KERN_OSRELEASE;
    2347. 

  2347.  		datalen = sizeof(sysctlstring);
    2348. 

  2348.  		sysctl(mib, 2, sysctlstring, &datalen, NULL, 0);
    2349. 

  2349.  		SHA1_Update(&context, sysctlstring, datalen);
    2350. 

  2350. -
    2351. 

  2351. +#endif
    2352. 

  2352.  		/* The running kernel's version string: */
    2353. 

  2353. +#if !LINUX
    2354. 

  2354.  		mib[0] = CTL_KERN;
    2355. 

  2355.  		mib[1] = KERN_VERSION;
    2356. 

  2356.  		datalen = sizeof(sysctlstring);
    2357. 

  2357.  		sysctl(mib, 2, sysctlstring, &datalen, NULL, 0);
    2358. 

  2358.  		SHA1_Update(&context, sysctlstring, datalen);
    2359. 

  2359. -
    2360. 

  2360. +#endif
    2361. 

  2361.  		/* The system's load average: */
    2362. 

  2362.  		datalen = sizeof(sysloadavg);
    2363. 

  2363.  		getloadavg(sysloadavg, 3);
    2364. 

  2364.  		SHA1_Update(&context, &sysloadavg, datalen);
    2365. 

  2365.  
    2366. 

  2366.  		/* The system's VM statistics: */
    2367. 

  2367. +#if !LINUX
    2368. 

  2368.  		mib[0] = CTL_VM;
    2369. 

  2369.  		mib[1] = VM_METER;
    2370. 

  2370.  		datalen = sizeof(sysvmtotal);
    2371. 

  2371.  		sysctl(mib, 2, &sysvmtotal, &datalen, NULL, 0);
    2372. 

  2372.  		SHA1_Update(&context, &sysvmtotal, datalen);
    2373. 

  2373. -
    2374. 

  2374. +#endif
    2375. 

  2375.  		/* The current GMT (26 ASCII characters): */
    2376. 

  2376.  		time(&now);
    2377. 

  2377.  		strncpy(randomInputBuffer, asctime(gmtime(&now)), 26);	/* "Mon Mar 27 13:46:26 2000" */
    2378. 

  2378. Files diskdev_cmds-332.14/newfs_hfs.tproj/makehfs.o and diskdev_cmds-332.14-patched/newfs_hfs.tproj/makehfs.o differ
    2379. 

  2379. Files diskdev_cmds-332.14/newfs_hfs.tproj/newfs_hfs and diskdev_cmds-332.14-patched/newfs_hfs.tproj/newfs_hfs differ
    2380. 

  2380. diff -druN diskdev_cmds-332.14/newfs_hfs.tproj/newfs_hfs.8 diskdev_cmds-332.14-patched/newfs_hfs.tproj/newfs_hfs.8
    2381. 

  2381. --- diskdev_cmds-332.14/newfs_hfs.tproj/newfs_hfs.8	2006-02-20 22:45:15.000000000 +0100
    2382. 

  2382. +++ diskdev_cmds-332.14-patched/newfs_hfs.tproj/newfs_hfs.8	2008-07-01 22:35:53.000000000 +0200
    2383. 

  2383. @@ -93,7 +93,7 @@
    2384. 

  2384.  option followed by a comma
    2385. 

  2385.  separated list of the form arg=blocks.
    2386. 

  2386.  .Pp
    2387. 

  2387. -Example:  -c c=5000,e=500
    2388. 

  2388. +Example:  \-c c=5000,e=500
    2389. 

  2389.  .Bl -tag -width Fl
    2390. 

  2390.  .It Em a=blocks
    2391. 

  2391.  Set the attribute file clump size.
    2392. 

  2392. @@ -126,7 +126,7 @@
    2393. 

  2393.  size must be a power of two and no larger than
    2394. 

  2394.  32768 bytes.
    2395. 

  2395.  .Pp
    2396. 

  2396. -Example:  -n c=8192,e=4096
    2397. 

  2397. +Example:  \-n c=8192,e=4096
    2398. 

  2398.  .Bl -tag -width Fl
    2399. 

  2399.  .It Em a=bytes
    2400. 

  2400.  Set the attribute b-tree node size.
    2401. 

  2401. diff -druN diskdev_cmds-332.14/newfs_hfs.tproj/newfs_hfs.c diskdev_cmds-332.14-patched/newfs_hfs.tproj/newfs_hfs.c
    2402. 

  2402. --- diskdev_cmds-332.14/newfs_hfs.tproj/newfs_hfs.c	2006-02-20 22:45:15.000000000 +0100
    2403. 

  2403. +++ diskdev_cmds-332.14-patched/newfs_hfs.tproj/newfs_hfs.c	2008-07-01 22:30:11.000000000 +0200
    2404. 

  2404. @@ -38,8 +38,13 @@
    2405. 

  2405.  #include <sys/mount.h>
    2406. 

  2406.  #include <sys/param.h>
    2407. 

  2407.  #include <sys/stat.h>
    2408. 

  2408. +#if LINUX
    2409. 

  2409. +#include <time.h>
    2410. 

  2410. +#endif
    2411. 

  2411.  
    2412. 

  2412. +#if !LINUX
    2413. 

  2413.  #include <IOKit/storage/IOMediaBSDClient.h>
    2414. 

  2414. +#endif
    2415. 

  2415.  
    2416. 

  2416.  #include <hfs/hfs_format.h>
    2417. 

  2417.  #include "newfs_hfs.h"
    2418. 

  2418. @@ -73,7 +78,9 @@
    2419. 

  2419.  
    2420. 

  2420.  char	*progname;
    2421. 

  2421.  char	gVolumeName[kHFSPlusMaxFileNameChars + 1] = {kDefaultVolumeNameStr};
    2422. 

  2422. -char	rawdevice[MAXPATHLEN];
    2423. 

  2423. +#if !LINUX
    2424. 

  2424. +char	rawdevice[MAXPATHLEN]; 
    2425. 

  2425. +#endif
    2426. 

  2426.  char	blkdevice[MAXPATHLEN];
    2427. 

  2427.  UInt32	gBlockSize = 0;
    2428. 

  2428.  UInt32	gNextCNID = kHFSFirstUserCatalogNodeID;
    2429. 

  2429. @@ -137,8 +144,10 @@
    2430. 

  2430.  	extern int optind;
    2431. 

  2431.  	int ch;
    2432. 

  2432.  	int forceHFS;
    2433. 

  2433. +#if !LINUX
    2434. 

  2434.  	char *cp, *special;
    2435. 

  2435.  	struct statfs *mp;
    2436. 

  2436. +#endif
    2437. 

  2437.  	int n;
    2438. 

  2438.  	
    2439. 

  2439.  	if ((progname = strrchr(*argv, '/')))
    2440. 

  2440. @@ -238,7 +247,9 @@
    2441. 

  2441.  
    2442. 

  2442.  	if (argc != 1)
    2443. 

  2443.  		usage();
    2444. 

  2444. -
    2445. 

  2445. +#if LINUX
    2446. 

  2446. +	(void) sprintf(blkdevice, "%s", argv[0]);
    2447. 

  2447. +#else
    2448. 

  2448.  	special = argv[0];
    2449. 

  2449.  	cp = strrchr(special, '/');
    2450. 

  2450.  	if (cp != 0)
    2451. 

  2451. @@ -247,6 +258,7 @@
    2452. 

  2452.  		special++;
    2453. 

  2453.  	(void) sprintf(rawdevice, "%sr%s", _PATH_DEV, special);
    2454. 

  2454.  	(void) sprintf(blkdevice, "%s%s", _PATH_DEV, special);
    2455. 

  2455. +#endif
    2456. 

  2456.  
    2457. 

  2457.  	if (forceHFS && gJournaled) {
    2458. 

  2458.  		fprintf(stderr, "-h -J: incompatible options specified\n");
    2459. 

  2459. @@ -268,6 +280,9 @@
    2460. 

  2460.  	/*
    2461. 

  2461.  	 * Check if target device is aready mounted
    2462. 

  2462.  	 */
    2463. 

  2463. +#if LINUX
    2464. 

  2464. +	// FIXME
    2465. 

  2465. +#else
    2466. 

  2466.  	n = getmntinfo(&mp, MNT_NOWAIT);
    2467. 

  2467.  	if (n == 0)
    2468. 

  2468.  		fatal("%s: getmntinfo: %s", blkdevice, strerror(errno));
    2469. 

  2469. @@ -277,14 +292,19 @@
    2470. 

  2470.  			fatal("%s is mounted on %s", blkdevice, mp->f_mntonname);
    2471. 

  2471.  		++mp;
    2472. 

  2472.  	}
    2473. 

  2473. +#endif
    2474. 

  2474.  
    2475. 

  2475. -	if (hfs_newfs(rawdevice, forceHFS, true) < 0) {
    2476. 

  2476. +	if (hfs_newfs(blkdevice, forceHFS, true) < 0) {
    2477. 

  2477. +#if LINUX
    2478. 

  2478. +		err(1, NULL);
    2479. 

  2479. +#else
    2480. 

  2480.  		/* On ENXIO error use the block device (to get de-blocking) */
    2481. 

  2481.  		if (errno == ENXIO) {
    2482. 

  2482.  			if (hfs_newfs(blkdevice, forceHFS, false) < 0)
    2483. 

  2483.  				err(1, NULL);
    2484. 

  2484.  		} else
    2485. 

  2485.  			err(1, NULL);
    2486. 

  2486. +#endif
    2487. 

  2487.  	}
    2488. 

  2488.  
    2489. 

  2489.  	exit(0);
    2490. 

  2490. @@ -458,7 +478,7 @@
    2491. 

  2491.  			fatal("%s: block size is too small for %lld sectors", optarg, gBlockSize, sectorCount);
    2492. 

  2492.  
    2493. 

  2493.  		if (gBlockSize < HFSOPTIMALBLKSIZE)
    2494. 

  2494. -			warnx("Warning: %ld is a non-optimal block size (4096 would be a better choice)", gBlockSize);
    2495. 

  2495. +			warnx("Warning: %i is a non-optimal block size (4096 would be a better choice)", gBlockSize);
    2496. 

  2496.  	}
    2497. 

  2497.  }
    2498. 

  2498.  
    2499. 

  2499. @@ -472,7 +492,9 @@
    2500. 

  2500.  	int fso = 0;
    2501. 

  2501.  	int retval = 0;
    2502. 

  2502.  	hfsparams_t defaults = {0};
    2503. 

  2503. +#if !LINUX
    2504. 

  2504.  	u_int64_t maxSectorsPerIO;
    2505. 

  2505. +#endif
    2506. 

  2506.  
    2507. 

  2507.  	if (gNoCreate) {
    2508. 

  2508.  		fso = open( device, O_RDONLY | O_NDELAY, 0 );
    2509. 

  2509. @@ -485,7 +507,33 @@
    2510. 

  2510.  
    2511. 

  2511.  	if (fstat( fso, &stbuf) < 0)
    2512. 

  2512.  		fatal("%s: %s", device, strerror(errno));
    2513. 

  2513. +#if LINUX
    2514. 

  2514. +	dip.sectorSize = 512;
    2515. 

  2515. +	dip.sectorsPerIO = 256;
    2516. 

  2516.  
    2517. 

  2517. +#ifndef	BLKGETSIZE
    2518. 

  2518. +#define	BLKGETSIZE		_IO(0x12,96)
    2519. 

  2519. +#endif
    2520. 

  2520. +#ifndef	BLKGETSIZE64
    2521. 

  2521. +#define BLKGETSIZE64		_IOR(0x12,114,size_t)
    2522. 

  2522. +#endif
    2523. 

  2523. +        
    2524. 

  2524. +	if (S_ISREG(stbuf.st_mode)) {
    2525. 

  2525. +                dip.totalSectors = stbuf.st_size / 512;
    2526. 

  2526. +        } 
    2527. 

  2527. +	else if (S_ISBLK(stbuf.st_mode)) {
    2528. 

  2528. +                unsigned long size;
    2529. 

  2529. +                u_int64_t size64;
    2530. 

  2530. +                if (!ioctl(fso, BLKGETSIZE64, &size64))
    2531. 

  2531. +                        dip.totalSectors = size64 / 512;
    2532. 

  2532. +                else if (!ioctl(fso, BLKGETSIZE, &size))
    2533. 

  2533. +                        dip.totalSectors = size;
    2534. 

  2534. +                else
    2535. 

  2535. +                        fatal("%s: %s", device, strerror(errno));
    2536. 

  2536. +        } 
    2537. 

  2537. +	else
    2538. 

  2538. +                fatal("%s: is not a block device", device);
    2539. 

  2539. +#else
    2540. 

  2540.  	if (ioctl(fso, DKIOCGETBLOCKCOUNT, &dip.totalSectors) < 0)
    2541. 

  2541.  		fatal("%s: %s", device, strerror(errno));
    2542. 

  2542.  
    2543. 

  2543. @@ -493,14 +541,17 @@
    2544. 

  2544.  		fatal("%s: %s", device, strerror(errno));
    2545. 

  2545.  
    2546. 

  2546.  	if (ioctl(fso, DKIOCGETMAXBLOCKCOUNTWRITE, &maxSectorsPerIO) < 0)
    2547. 

  2547. -		dip.sectorsPerIO = (128 * 1024) / dip.sectorSize;  /* use 128K as default */
    2548. 

  2548. +		dip.sectorsPerIO = (128 * 1024) / dip.sectorSize; /* use 128K as default */
    2549. 

  2549.  	else
    2550. 

  2550.  		dip.sectorsPerIO = MIN(maxSectorsPerIO, (1024 * 1024) / dip.sectorSize);
    2551. 

  2551. +#endif
    2552. 

  2552. +	
    2553. 

  2553.          /*
    2554. 

  2554. -         * The make_hfs code currentlydoes 512 byte sized I/O.
    2555. 

  2555. +         * The make_hfs code currently does 512 byte sized I/O.
    2556. 

  2556.           * If the sector size is bigger than 512, start over
    2557. 

  2557.           * using the block device (to get de-blocking).
    2558. 

  2558.           */       
    2559. 

  2559. +#if !LINUX
    2560. 

  2560.          if (dip.sectorSize != kBytesPerSector) {
    2561. 

  2561.  		if (isRaw) {
    2562. 

  2562.  			close(fso);
    2563. 

  2563. @@ -515,7 +566,8 @@
    2564. 

  2564.  			dip.sectorSize = kBytesPerSector;
    2565. 

  2565.  		}
    2566. 

  2566.          }
    2567. 

  2567. -  
    2568. 

  2568. +#endif
    2569. 

  2569. +
    2570. 

  2570.  	dip.fd = fso;
    2571. 

  2571.  	dip.sectorOffset = 0;
    2572. 

  2572.  	time(&createtime);
    2573. 

  2573. @@ -693,7 +745,7 @@
    2574. 

  2574.  	defaults->catalogClumpSize = clumpSize;
    2575. 

  2575.  	defaults->catalogNodeSize = catnodesiz;
    2576. 

  2576.  	if (gBlockSize < 4096 && gBlockSize < catnodesiz)
    2577. 

  2577. -		warnx("Warning: block size %ld is less than catalog b-tree node size %ld", gBlockSize, catnodesiz);
    2578. 

  2578. +		warnx("Warning: block size %i is less than catalog b-tree node size %i", gBlockSize, catnodesiz);
    2579. 

  2579.  
    2580. 

  2580.  	if (extclumpblks == 0) {
    2581. 

  2581.  		clumpSize = CalcHFSPlusBTreeClumpSize(gBlockSize, extnodesiz, sectorCount, FALSE);
    2582. 

  2582. @@ -706,7 +758,7 @@
    2583. 

  2583.  	defaults->extentsClumpSize = clumpSize;
    2584. 

  2584.  	defaults->extentsNodeSize = extnodesiz;
    2585. 

  2585.  	if (gBlockSize < extnodesiz)
    2586. 

  2586. -		warnx("Warning: block size %ld is less than extents b-tree node size %ld", gBlockSize, extnodesiz);
    2587. 

  2587. +		warnx("Warning: block size %i is less than extents b-tree node size %i", gBlockSize, extnodesiz);
    2588. 

  2588.  
    2589. 

  2589.  	if (atrclumpblks == 0) {
    2590. 

  2590.  		clumpSize = 0;
    2591. 

  2591. @@ -754,22 +806,22 @@
    2592. 

  2592.  
    2593. 

  2593.  	if (gNoCreate) {
    2594. 

  2594.  		if (!gWrapper)
    2595. 

  2595. -			printf("%qd sectors (%lu bytes per sector)\n", sectorCount, sectorSize);
    2596. 

  2596. +			printf("%lld sectors (%u bytes per sector)\n", sectorCount, sectorSize);
    2597. 

  2597.  		printf("HFS Plus format parameters:\n");
    2598. 

  2598.  		printf("\tvolume name: \"%s\"\n", gVolumeName);
    2599. 

  2599. -		printf("\tblock-size: %lu\n", defaults->blockSize);
    2600. 

  2600. -		printf("\ttotal blocks: %lu\n", totalBlocks);
    2601. 

  2601. +		printf("\tblock-size: %u\n", defaults->blockSize);
    2602. 

  2602. +		printf("\ttotal blocks: %u\n", totalBlocks);
    2603. 

  2603.  		if (gJournaled)
    2604. 

  2604.  			printf("\tjournal-size: %dk\n", (int)defaults->journalSize/1024);
    2605. 

  2605. -		printf("\tfirst free catalog node id: %lu\n", defaults->nextFreeFileID);
    2606. 

  2606. -		printf("\tcatalog b-tree node size: %lu\n", defaults->catalogNodeSize);
    2607. 

  2607. -		printf("\tinitial catalog file size: %lu\n", defaults->catalogClumpSize);
    2608. 

  2608. -		printf("\textents b-tree node size: %lu\n", defaults->extentsNodeSize);
    2609. 

  2609. -		printf("\tinitial extents file size: %lu\n", defaults->extentsClumpSize);
    2610. 

  2610. -		printf("\tinitial allocation file size: %lu (%lu blocks)\n",
    2611. 

  2611. +		printf("\tfirst free catalog node id: %u\n", defaults->nextFreeFileID);
    2612. 

  2612. +		printf("\tcatalog b-tree node size: %u\n", defaults->catalogNodeSize);
    2613. 

  2613. +		printf("\tinitial catalog file size: %u\n", defaults->catalogClumpSize);
    2614. 

  2614. +		printf("\textents b-tree node size: %u\n", defaults->extentsNodeSize);
    2615. 

  2615. +		printf("\tinitial extents file size: %u\n", defaults->extentsClumpSize);
    2616. 

  2616. +		printf("\tinitial allocation file size: %u (%u blocks)\n",
    2617. 

  2617.  			defaults->allocationClumpSize, defaults->allocationClumpSize / gBlockSize);
    2618. 

  2618. -		printf("\tdata fork clump size: %lu\n", defaults->dataClumpSize);
    2619. 

  2619. -		printf("\tresource fork clump size: %lu\n", defaults->rsrcClumpSize);
    2620. 

  2620. +		printf("\tdata fork clump size: %u\n", defaults->dataClumpSize);
    2621. 

  2621. +		printf("\tresource fork clump size: %u\n", defaults->rsrcClumpSize);
    2622. 

  2622.  		if (defaults->flags & kUseAccessPerms) {
    2623. 

  2623.  			printf("\tuser ID: %d\n", (int)defaults->owner);
    2624. 

  2624.  			printf("\tgroup ID: %d\n", (int)defaults->group);
    2625. 

  2625. @@ -844,17 +896,17 @@
    2626. 

  2626.  	}
    2627. 

  2627.  	
    2628. 

  2628.  	if (gNoCreate) {
    2629. 

  2629. -		printf("%ld sectors at %ld bytes per sector\n", sectorCount, sectorSize);
    2630. 

  2630. +		printf("%i sectors at %i bytes per sector\n", sectorCount, sectorSize);
    2631. 

  2631.  		printf("%s format parameters:\n", gWrapper ? "HFS Wrapper" : "HFS");
    2632. 

  2632.  		printf("\tvolume name: \"%s\"\n", gVolumeName);
    2633. 

  2633. -		printf("\tblock-size: %ld\n", defaults->blockSize);
    2634. 

  2634. -		printf("\ttotal blocks: %ld\n", sectorCount / (alBlkSize / sectorSize) );
    2635. 

  2635. -		printf("\tfirst free catalog node id: %ld\n", defaults->nextFreeFileID);
    2636. 

  2636. -		printf("\tinitial catalog file size: %ld\n", defaults->catalogClumpSize);
    2637. 

  2637. -		printf("\tinitial extents file size: %ld\n", defaults->extentsClumpSize);
    2638. 

  2638. -		printf("\tfile clump size: %ld\n", defaults->dataClumpSize);
    2639. 

  2639. +		printf("\tblock-size: %i\n", defaults->blockSize);
    2640. 

  2640. +		printf("\ttotal blocks: %i\n", sectorCount / (alBlkSize / sectorSize) );
    2641. 

  2641. +		printf("\tfirst free catalog node id: %i\n", defaults->nextFreeFileID);
    2642. 

  2642. +		printf("\tinitial catalog file size: %i\n", defaults->catalogClumpSize);
    2643. 

  2643. +		printf("\tinitial extents file size: %i\n", defaults->extentsClumpSize);
    2644. 

  2644. +		printf("\tfile clump size: %i\n", defaults->dataClumpSize);
    2645. 

  2645.  		if (hfsgrowblks)
    2646. 

  2646. -			printf("\twrapper growable from %ld to %ld sectors\n", sectorCount, hfsgrowblks);
    2647. 

  2647. +			printf("\twrapper growable from %i to %i sectors\n", sectorCount, hfsgrowblks);
    2648. 

  2648.  	}
    2649. 

  2649.  }
    2650. 

  2650.  
    2651. 

  2651. diff -druN diskdev_cmds-332.14/newfs_hfs.tproj/newfs_hfs.h diskdev_cmds-332.14-patched/newfs_hfs.tproj/newfs_hfs.h
    2652. 

  2652. --- diskdev_cmds-332.14/newfs_hfs.tproj/newfs_hfs.h	2006-02-20 22:45:15.000000000 +0100
    2653. 

  2653. +++ diskdev_cmds-332.14-patched/newfs_hfs.tproj/newfs_hfs.h	2008-07-01 22:30:11.000000000 +0200
    2654. 

  2654. @@ -19,8 +19,12 @@
    2655. 

  2655.   * 
    2656. 

  2656.   * @APPLE_LICENSE_HEADER_END@
    2657. 

  2657.   */
    2658. 

  2658. - 
    2659. 

  2659. -#include <CoreFoundation/CFBase.h>
    2660. 

  2660. +
    2661. 

  2661. +#if LINUX
    2662. 

  2662. +#include "missing.h"
    2663. 

  2663. +#else
    2664. 

  2664. +#include <CoreFoundation/CFBase.h>*/
    2665. 

  2665. +#endif
    2666. 

  2666.  
    2667. 

  2667.  /*
    2668. 

  2668.   * Mac OS Finder flags
    2669. 

  2669. @@ -122,33 +126,33 @@
    2670. 

  2670.  #define kDTDF_FileID	16
    2671. 

  2671.  #define kDTDF_Name	"Desktop DF"
    2672. 

  2672.  #define kDTDF_Chars	10
    2673. 

  2673. -#define kDTDF_Type	'DTFL'
    2674. 

  2674. -#define kDTDF_Creator	'DMGR'
    2675. 

  2675. +#define kDTDF_Type	0x4454464C /* 'DTFL' */
    2676. 

  2676. +#define kDTDF_Creator	0x444D4752 /* 'DMGR' */
    2677. 

  2677.  
    2678. 

  2678.  #define kDTDB_FileID	17
    2679. 

  2679.  #define kDTDB_Name	"Desktop DB"
    2680. 

  2680.  #define kDTDB_Chars	10
    2681. 

  2681. -#define kDTDB_Type	'BTFL'
    2682. 

  2682. -#define kDTDB_Creator	'DMGR'
    2683. 

  2683. +#define kDTDB_Type	0x4254464C /* 'BTFL' */
    2684. 

  2684. +#define kDTDB_Creator	0x444D4752 /* 'DMGR' */
    2685. 

  2685.  #define kDTDB_Size	1024
    2686. 

  2686.  
    2687. 

  2687.  #define kReadMe_FileID	18
    2688. 

  2688.  #define kReadMe_Name	"ReadMe"
    2689. 

  2689.  #define kReadMe_Chars	6
    2690. 

  2690. -#define kReadMe_Type	'ttro'
    2691. 

  2691. -#define kReadMe_Creator	'ttxt'
    2692. 

  2692. +#define kReadMe_Type	0x7474726F /* 'ttro' */
    2693. 

  2693. +#define kReadMe_Creator	0x74747974 /* 'ttxt' */
    2694. 

  2694.  
    2695. 

  2695.  #define kFinder_FileID	19
    2696. 

  2696.  #define kFinder_Name	"Finder"
    2697. 

  2697.  #define kFinder_Chars	6
    2698. 

  2698. -#define kFinder_Type	'FNDR'
    2699. 

  2699. -#define kFinder_Creator	'MACS'
    2700. 

  2700. +#define kFinder_Type	0x464E4452 /* 'FNDR' */
    2701. 

  2701. +#define kFinder_Creator	0x4D414353 /* 'MACS' */
    2702. 

  2702.  
    2703. 

  2703.  #define kSystem_FileID	20
    2704. 

  2704.  #define kSystem_Name	"System"
    2705. 

  2705.  #define kSystem_Chars	6
    2706. 

  2706. -#define kSystem_Type	'zsys'
    2707. 

  2707. -#define kSystem_Creator	'MACS'
    2708. 

  2708. +#define kSystem_Type	0x7A737973 /* 'zsys' */
    2709. 

  2709. +#define kSystem_Creator	0x4D414353 /* 'MACS' */
    2710. 

  2710.  
    2711. 

  2711.  
    2712. 

  2712.  
    2713. 

  2713. Files diskdev_cmds-332.14/newfs_hfs.tproj/newfs_hfs.o and diskdev_cmds-332.14-patched/newfs_hfs.tproj/newfs_hfs.o differ
    2714. 

  2714.