[PATCH] isofs: show hidden files, add granularity for assoc/hidden files flags

The current isofs treatment of hidden files is flawed in two ways.  First,
it does not provide sufficient granularity; it hides both 'hidden' files
and 'associated' files (resource fork for Mac files).  Second, the default
behavior to completely strip hidden files, while an admirable
implementation of the spec, is a poor choice given the real world use of
hidden files as a poor mans copy protection scheme for MSDOS and Windows
based systems.  A longer description of this is available here:

   http://www.uwsg.iu.edu/hypermail/linux/kernel/0205.3/0267.html

This patch was originally built after a few private conversations with Alan
Cox; I shamefully failed to persist in seeing it go forward, I hope to make
amends now.

This patch introduces granularity by allowing explicit control for both
hidden and associated files.  It also reverses the default so that by
default, hidden files are treated as regular files on the iso9660 file
system.

This allow Wine to process Windows CDs, including those that are hybrid
Mac/Windows CDs properly and completely, without our having to go muck up
peoples fstabs as we do now.  (I have tested this with such a hybrid +
hidden CD and have verified that this patch works as claimed).

Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 14 insertions, 5 deletions

diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 72cc9727dc07..1652de1b6cb9 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -144,7 +144,8 @@ struct iso9660_options{
         char rock;
         char joliet;
         char cruft;
-        char unhide;
+        char hide;
+        char showassoc;
         char nocompress;
         unsigned char check;
         unsigned int blocksize;
@@ -309,13 +310,15 @@ enum {
         Opt_block, Opt_check_r, Opt_check_s, Opt_cruft, Opt_gid, Opt_ignore,
         Opt_iocharset, Opt_map_a, Opt_map_n, Opt_map_o, Opt_mode, Opt_nojoliet,
         Opt_norock, Opt_sb, Opt_session, Opt_uid, Opt_unhide, Opt_utf8, Opt_err,
-        Opt_nocompress,
+        Opt_nocompress, Opt_hide, Opt_showassoc,
 };
 
 static match_table_t tokens = {
         {Opt_norock, "norock"},
         {Opt_nojoliet, "nojoliet"},
         {Opt_unhide, "unhide"},
+        {Opt_hide, "hide"},
+        {Opt_showassoc, "showassoc"},
         {Opt_cruft, "cruft"},
         {Opt_utf8, "utf8"},
         {Opt_iocharset, "iocharset=%s"},
@@ -356,7 +359,8 @@ static int parse_options(char *options, struct iso9660_options *popt)
         popt->rock = 'y';
         popt->joliet = 'y';
         popt->cruft = 'n';
-        popt->unhide = 'n';
+        popt->hide = 'n';
+        popt->showassoc = 'n';
         popt->check = 'u';              /* unset */
         popt->nocompress = 0;
         popt->blocksize = 1024;
@@ -389,8 +393,12 @@ static int parse_options(char *options, struct iso9660_options *popt)
                 case Opt_nojoliet:
                         popt->joliet = 'n';
                         break;
+                case Opt_hide:
+                        popt->hide = 'y';
+                        break;
                 case Opt_unhide:
-                        popt->unhide = 'y';
+                case Opt_showassoc:
+                        popt->showassoc = 'y';
                         break;
                 case Opt_cruft:
                         popt->cruft = 'y';
@@ -784,7 +792,8 @@ root_found:
         sbi->s_rock = (opt.rock == 'y' ? 2 : 0);
         sbi->s_rock_offset = -1; /* initial offset, will guess until SP is found*/
         sbi->s_cruft = opt.cruft;
-        sbi->s_unhide = opt.unhide;
+        sbi->s_hide = opt.hide;
+        sbi->s_showassoc = opt.showassoc;
         sbi->s_uid = opt.uid;
         sbi->s_gid = opt.gid;
         sbi->s_utf8 = opt.utf8;