dir.c (ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672) dir.c (9769f4eb3fad2dd53a5d24c81ee5f7f05450742b)
1/*
2 * linux/fs/isofs/dir.c
3 *
4 * (C) 1992, 1993, 1994 Eric Youngdale Modified for ISO 9660 filesystem.
5 *
6 * (C) 1991 Linus Torvalds - minix filesystem
7 *
8 * Steve Beynon : Missing last directory entries fixed

--- 179 unchanged lines hidden (view full) ---

188 if (filldir(dirent, "..", 2, filp->f_pos, inode_number, DT_DIR) < 0)
189 break;
190 filp->f_pos += de_len;
191 continue;
192 }
193
194 /* Handle everything else. Do name translation if there
195 is no Rock Ridge NM field. */
1/*
2 * linux/fs/isofs/dir.c
3 *
4 * (C) 1992, 1993, 1994 Eric Youngdale Modified for ISO 9660 filesystem.
5 *
6 * (C) 1991 Linus Torvalds - minix filesystem
7 *
8 * Steve Beynon : Missing last directory entries fixed

--- 179 unchanged lines hidden (view full) ---

188 if (filldir(dirent, "..", 2, filp->f_pos, inode_number, DT_DIR) < 0)
189 break;
190 filp->f_pos += de_len;
191 continue;
192 }
193
194 /* Handle everything else. Do name translation if there
195 is no Rock Ridge NM field. */
196 if (sbi->s_unhide == 'n') {
197 /* Do not report hidden or associated files */
198 if (de->flags[-sbi->s_high_sierra] & 5) {
199 filp->f_pos += de_len;
200 continue;
201 }
196
197 /*
198 * Do not report hidden files if so instructed, or associated
199 * files unless instructed to do so
200 */
201 if ((sbi->s_hide == 'y' &&
202 (de->flags[-sbi->s_high_sierra] & 1)) ||
203 (sbi->s_showassoc =='n' &&
204 (de->flags[-sbi->s_high_sierra] & 4))) {
205 filp->f_pos += de_len;
206 continue;
202 }
203
204 map = 1;
205 if (sbi->s_rock) {
206 len = get_rock_ridge_filename(de, tmpname, inode);
207 if (len != 0) { /* may be -1 */
208 p = tmpname;
209 map = 0;

--- 60 unchanged lines hidden --- 		207 }
208
209 map = 1;
210 if (sbi->s_rock) {
211 len = get_rock_ridge_filename(de, tmpname, inode);
212 if (len != 0) { /* may be -1 */
213 p = tmpname;
214 map = 0;

--- 60 unchanged lines hidden ---