summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>1997-05-31 00:50:08 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>1997-05-31 00:50:08 +0000
commit68742c61922deb250149ee911cb4da59181f125a (patch)
tree26c3e9c7a3ce943fd53b8c42fb74c647a5fb2af1 /sys/arch/i386
parent030cf7a285790c6c1b54ac5483c44ab26350fd07 (diff)
ufs changes
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/boot/sys.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/i386/boot/sys.c b/sys/arch/i386/boot/sys.c
index cf9d1352a72..3a590c2898b 100644
--- a/sys/arch/i386/boot/sys.c
+++ b/sys/arch/i386/boot/sys.c
@@ -103,8 +103,8 @@ loop:
bcopy(&((struct dinode *)iodest)[ino_to_fsbo(fs,ino)],
&inode.i_din,
sizeof(struct dinode));
- if ((inode.i_mode & IFMT) == IFLNK) {
- int link_len = inode.i_size;
+ if ((inode.i_ffs_mode & IFMT) == IFLNK) {
+ int link_len = inode.i_ffs_size;
int len = strlen(path);
if (link_len + len > MAXPATHLEN ||
@@ -112,7 +112,7 @@ loop:
return 0;
bcopy(path, &pathname[link_len], len + 1);
if (link_len < fs->fs_maxsymlinklen)
- bcopy(inode.i_shortlink, pathname, link_len);
+ bcopy(inode.i_ffs_shortlink, pathname, link_len);
else {
poff = 0;
read(pathname,link_len);
@@ -128,14 +128,14 @@ loop:
return 1;
while (*path == '/')
path++;
- if (!inode.i_size || ((inode.i_mode & IFMT) != IFDIR))
+ if (!inode.i_ffs_size || ((inode.i_ffs_mode & IFMT) != IFDIR))
return 0;
parent = ino;
for (rest = path; (ch = *rest) && ch != '/'; rest++);
*rest = 0;
loc = 0;
do {
- if (loc >= inode.i_size)
+ if (loc >= inode.i_ffs_size)
if (list_only) {
putchar('\n');
return -1;
@@ -171,8 +171,8 @@ block_map(file_block)
int file_block;
{
if (file_block < NDADDR)
- return(inode.i_db[file_block]);
- if ((bnum = fsbtodb(fs, inode.i_ib[0]) + boff) != mapblock) {
+ return(inode.i_ffs_db[file_block]);
+ if ((bnum = fsbtodb(fs, inode.i_ffs_ib[0]) + boff) != mapblock) {
iodest = mapbuf;
cnt = fs->fs_bsize;
devread();