Deleted Added
full compact
cd9660_lookup.c (43301) cd9660_lookup.c (45773)
1/*-
2 * Copyright (c) 1989, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley
6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension
7 * Support code is derived from software contributed to Berkeley
8 * by Atsushi Murai (amurai@spec.co.jp).

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

33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * from: @(#)ufs_lookup.c 7.33 (Berkeley) 5/19/91
39 *
40 * @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94
1/*-
2 * Copyright (c) 1989, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley
6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension
7 * Support code is derived from software contributed to Berkeley
8 * by Atsushi Murai (amurai@spec.co.jp).

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

33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * from: @(#)ufs_lookup.c 7.33 (Berkeley) 5/19/91
39 *
40 * @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94
41 * $Id: cd9660_lookup.c,v 1.20 1997/11/07 08:52:50 phk Exp $
41 * $Id: cd9660_lookup.c,v 1.21 1999/01/27 21:49:54 dillon Exp $
42 */
43
44#include <sys/param.h>
45#include <sys/systm.h>
46#include <sys/namei.h>
47#include <sys/buf.h>
48#include <sys/vnode.h>
49#include <sys/mount.h>

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

232 * release directory buffer.
233 */
234 dp->i_ino = isodirino(ep, imp);
235 goto found;
236 }
237 if (namelen != 1
238 || ep->name[0] != 0)
239 goto notfound;
42 */
43
44#include <sys/param.h>
45#include <sys/systm.h>
46#include <sys/namei.h>
47#include <sys/buf.h>
48#include <sys/vnode.h>
49#include <sys/mount.h>

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

232 * release directory buffer.
233 */
234 dp->i_ino = isodirino(ep, imp);
235 goto found;
236 }
237 if (namelen != 1
238 || ep->name[0] != 0)
239 goto notfound;
240 } else if (!(res = isofncmp(name,len,
241 ep->name,namelen))) {
240 } else if (!(res = isofncmp(name, len, ep->name, namelen, imp->joliet_level))) {
242 if (isoflags & 2)
243 ino = isodirino(ep, imp);
244 else
245 ino = dbtob(bp->b_blkno)
246 + entryoffsetinblock;
247 saveoffset = dp->i_offset;
248 } else if (ino)
249 goto foundino;

--- 173 unchanged lines hidden ---
241 if (isoflags & 2)
242 ino = isodirino(ep, imp);
243 else
244 ino = dbtob(bp->b_blkno)
245 + entryoffsetinblock;
246 saveoffset = dp->i_offset;
247 } else if (ino)
248 goto foundino;

--- 173 unchanged lines hidden ---