Changeset 254

Timestamp:

Oct 25, 2009, 8:41:32 PM (15 years ago)

Author:

katerina

Message:

Fix for ticket #171 (..namedfork/rsrc deprecated on Mac OS X).

Location:

trunk

Files:

• docs/MANUAL-2_3.html.tar (modified) ( previous)
• docs/MANUAL-2_3.pdf (modified) ( previous)
• include/sh_files.h (modified) (1 diff)
• src/sh_files.c (modified) (2 diffs)
• src/sh_readconf.c (modified) (1 diff)

trunk/include/sh_files.h

@@ -53 +53 @@
 int sh_files_check_hardlinks (const char * opt);
 
+/* check  rsrc fork (Mac OS X)
+ */
+int sh_files_use_rsrc(const char * str);
+
 /* set recursion depth
  */

trunk/src/sh_files.c

@@ -1941 +1941 @@
 int get_the_fd (SL_TICKET ticket);
 
+static int sh_use_rsrc = S_FALSE;
+
+int sh_files_use_rsrc(const char * str)
+{
+  return sh_util_flagval(str, &sh_use_rsrc);
+}
 
 static ShFileType sh_files_filecheck (int class, char * dirName, 
@@ -2102 +2108 @@
     }
   
-#ifdef HOST_IS_DARWIN
+#if defined(HOST_IS_DARWIN)
   /*
    * Check for resource fork
    */
-  if ( (theFile->c_mode[0] != 'd') && (rsrcflag == 0) )
+  if ( (sh_use_rsrc == S_TRUE) && (theFile->c_mode[0] != 'd') && (rsrcflag == 0) )
     {
       int  dummy;

trunk/src/sh_readconf.c

@@ -946 +946 @@
   { N_("usehardlinkcheck"),   SH_SECTION_MISC,   SH_SECTION_NONE, 
     sh_files_check_hardlinks },
+  { N_("usersrccheck"),       SH_SECTION_MISC,   SH_SECTION_NONE, 
+    sh_files_use_rsrc },
   { N_("hardlinkoffset"),     SH_SECTION_MISC,   SH_SECTION_NONE,
     sh_files_hle_reg },