Deleted Added
full compact
ufsread.c (119483) ufsread.c (131575)
1/*-
2 * Copyright (c) 2002 Networks Associates Technology, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by Marshall
6 * Kirk McKusick and Network Associates Laboratories, the Security
7 * Research Division of Network Associates, Inc. under DARPA/SPAWAR
8 * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS

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

18 *
19 * This software is provided "AS IS" and without any express or
20 * implied warranties, including, without limitation, the implied
21 * warranties of merchantability and fitness for a particular
22 * purpose.
23 */
24
25#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002 Networks Associates Technology, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by Marshall
6 * Kirk McKusick and Network Associates Laboratories, the Security
7 * Research Division of Network Associates, Inc. under DARPA/SPAWAR
8 * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS

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

18 *
19 * This software is provided "AS IS" and without any express or
20 * implied warranties, including, without limitation, the implied
21 * warranties of merchantability and fitness for a particular
22 * purpose.
23 */
24
25#include <sys/cdefs.h>
26__FBSDID("$FreeBSD: head/sys/boot/common/ufsread.c 119483 2003-08-25 23:30:41Z obrien $");
26__FBSDID("$FreeBSD: head/sys/boot/common/ufsread.c 131575 2004-07-04 16:11:03Z stefanf $");
27
28#include <ufs/ufs/dinode.h>
29#include <ufs/ffs/fs.h>
30#ifdef __i386__
31/* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase
32 (see sys/ufs/ffs/fs.h rev 1.39) so that i386 boot loader (boot2) can
33 support both UFS1 and UFS2 again. */
34#undef cgbase

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

63static struct dmadat *dmadat;
64
65static ino_t lookup(const char *);
66static ssize_t fsread(ino_t, void *, size_t);
67
68static int ls, dsk_meta;
69static uint32_t fs_off;
70
27
28#include <ufs/ufs/dinode.h>
29#include <ufs/ffs/fs.h>
30#ifdef __i386__
31/* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase
32 (see sys/ufs/ffs/fs.h rev 1.39) so that i386 boot loader (boot2) can
33 support both UFS1 and UFS2 again. */
34#undef cgbase

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

63static struct dmadat *dmadat;
64
65static ino_t lookup(const char *);
66static ssize_t fsread(ino_t, void *, size_t);
67
68static int ls, dsk_meta;
69static uint32_t fs_off;
70
71static __inline__ int
71static __inline int
72fsfind(const char *name, ino_t * ino)
73{
74 char buf[DEV_BSIZE];
75 struct dirent *d;
76 char *s;
77 ssize_t n;
78
79 fs_off = 0;

--- 192 unchanged lines hidden ---
72fsfind(const char *name, ino_t * ino)
73{
74 char buf[DEV_BSIZE];
75 struct dirent *d;
76 char *s;
77 ssize_t n;
78
79 fs_off = 0;

--- 192 unchanged lines hidden ---