Home Explore Help
Sign In
dfanfdsanfdsa
/
ood-ports-lbsd-fork1
forked from jimmy/ood-ports-lbsd
Watch 1
Star 0
Fork 0
Files
Tree: f08698bfd3
Branches Tags
ood-ports-lb...
/
misc
/
hfsplus
/
patches
/
patch-libhfsp_src_volume_c

patch-libhfsp_src_volume_c 2.2 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748 
  1. $OpenBSD: patch-libhfsp_src_volume_c,v 1.1 2011/02/06 16:03:55 fgsch Exp $
    2. 

  2. --- libhfsp/src/volume.c.orig	Tue Mar 26 18:00:29 2002
    3. 

  3. +++ libhfsp/src/volume.c	Sat Jan 29 06:01:51 2011
    4. 

  4. @@ -323,7 +323,8 @@ void* volume_writefork(void *p, hfsp_fork_raw* f)
    5. 

  5.   */
    6. 

  6.  static int volume_readbuf(hfsp_vh* vh, void* p)
    7. 

  7.  {
    8. 

  8. -    if ( (vh->signature	= bswabU16_inc(p)) != HFSP_VOLHEAD_SIG) 
    9. 

  9. +    vh->signature	= bswabU16_inc(p);
    10. 

  10. +    if (vh->signature != HFSP_VOLHEAD_SIG) 
    11. 

  11.  	HFSP_ERROR(-1, "This is not a HFS+ volume");
    12. 

  12.      vh->version	    	= bswabU16_inc(p);
    13. 

  13.      vh->attributes   	= bswabU32_inc(p); 
    14. 

  14. @@ -345,7 +346,7 @@ static int volume_readbuf(hfsp_vh* vh, void* p)
    15. 

  15.      vh->write_count	= bswabU32_inc(p);
    16. 

  16.      vh->encodings_bmp	= bswabU64_inc(p);
    17. 

  17.      memcpy(vh->finder_info, p, 32); 
    18. 

  18. -    ((char*) p) += 32; // finderinfo is not used by now
    19. 

  19. +    p = (((char *)p) + 32); // finderinfo is not used by now
    20. 

  20.      p = volume_readfork(p, &vh->alloc_file );
    21. 

  21.      p = volume_readfork(p, &vh->ext_file   );
    22. 

  22.      p = volume_readfork(p, &vh->cat_file   );
    23. 

  23. @@ -381,7 +382,7 @@ static int volume_writebuf(hfsp_vh* vh, void* p)
    24. 

  24.      bstoreU32_inc(p, vh->write_count	);
    25. 

  25.      bstoreU64_inc(p, vh->encodings_bmp	);
    26. 

  26.      memcpy(p, vh->finder_info, 32); 
    27. 

  27. -    ((char*) p) += 32; // finderinfo is not used by now
    28. 

  28. +    p = (((char *)p) + 32); // finderinfo is not used by now
    29. 

  29.      p = volume_writefork(p, &vh->alloc_file );
    30. 

  30.      p = volume_writefork(p, &vh->ext_file   );
    31. 

  31.      p = volume_writefork(p, &vh->cat_file   );
    32. 

  32. @@ -417,12 +418,12 @@ static int volume_read_wrapper(volume * vol, hfsp_vh* 
    33. 

  33.    
    34. 

  34.  	UInt16	embeds, embedl;		/* Start/lenght of embedded area in blocks */
    35. 

  35.  	
    36. 

  36. -	((char*) p) += 0x12;		/* skip unneeded HFS vol fields */
    37. 

  37. +	p = (((char *)p) + 0x12);	/* skip unneeded HFS vol fields */
    38. 

  38.  	drAlBlkSiz = bswabU32_inc(p);	/* offset 0x14 */
    39. 

  39. -	((char*) p) += 0x4;		/* skip unneeded HFS vol fields */
    40. 

  40. +	p = (((char *)p) + 0x4);	/* skip unneeded HFS vol fields */
    41. 

  41.  	drAlBlSt    = bswabU16_inc(p);	/* offset 0x1C */
    42. 

  42.  	
    43. 

  43. -	((char*) p) += 0x5E;		/* skip unneeded HFS vol fields */
    44. 

  44. +	p = (((char *)p) + 0x5E);	/* skip unneeded HFS vol fields */
    45. 

  45.  	signature = bswabU16_inc(p);	/* offset 0x7C, drEmbedSigWord */
    46. 

  46.  	if (signature != HFSP_VOLHEAD_SIG)
    47. 

  47.  	    HFSP_ERROR(-1, "This looks like a normal HFS volume");
    48. 

  48.