projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
missing fsbtodb!
[unix-history]
/
usr
/
src
/
sbin
/
fsck
/
pass1.c
diff --git
a/usr/src/sbin/fsck/pass1.c
b/usr/src/sbin/fsck/pass1.c
index
80690fe
..
3ecc82a
100644
(file)
--- a/
usr/src/sbin/fsck/pass1.c
+++ b/
usr/src/sbin/fsck/pass1.c
@@
-1,6
+1,12
@@
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved. The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+
#ifndef lint
#ifndef lint
-static char
version[] = "@(#)pass1.c 3.6
(Berkeley) %G%";
-#endif
+static char
sccsid[] = "@(#)pass1.c 5.4
(Berkeley) %G%";
+#endif
not lint
#include <sys/param.h>
#include <sys/inode.h>
#include <sys/param.h>
#include <sys/inode.h>
@@
-15,6
+21,7
@@
pass1()
{
register int c, i, j;
register DINODE *dp;
{
register int c, i, j;
register DINODE *dp;
+ struct zlncnt *zlnp;
int ndb, partial, cgd;
struct inodesc idesc;
ino_t inumber;
int ndb, partial, cgd;
struct inodesc idesc;
ino_t inumber;
@@
-62,11
+69,18
@@
pass1()
continue;
}
lastino = inumber;
continue;
}
lastino = inumber;
- if (dp->di_size < 0) {
+ if (dp->di_size < 0 ||
+ dp->di_size + sblock.fs_bsize - 1 < 0) {
if (debug)
printf("bad size %d:", dp->di_size);
goto unknown;
}
if (debug)
printf("bad size %d:", dp->di_size);
goto unknown;
}
+ if (!preen && (dp->di_mode & IFMT) == IFMT &&
+ reply("HOLD BAD BLOCK") == 1) {
+ dp->di_size = sblock.fs_fsize;
+ dp->di_mode = IFREG|0600;
+ inodirty();
+ }
ndb = howmany(dp->di_size, sblock.fs_bsize);
if (SPECIAL(dp))
ndb++;
ndb = howmany(dp->di_size, sblock.fs_bsize);
if (SPECIAL(dp))
ndb++;
@@
-86,22
+100,20
@@
pass1()
dp->di_ib[j]);
goto unknown;
}
dp->di_ib[j]);
goto unknown;
}
- if (!preen && (dp->di_mode & IFMT) == IFMT &&
- reply("HOLD BAD BLOCK") == 1) {
- dp->di_size = sblock.fs_fsize;
- dp->di_mode = IFREG|0600;
- inodirty();
- } else if (ftypeok(dp) == 0)
+ if (ftypeok(dp) == 0)
goto unknown;
n_files++;
lncntp[inumber] = dp->di_nlink;
if (dp->di_nlink <= 0) {
goto unknown;
n_files++;
lncntp[inumber] = dp->di_nlink;
if (dp->di_nlink <= 0) {
- if (badlnp < &badlncnt[MAXLNCNT])
- *badlnp++ = inumber;
- else {
+ zlnp = (struct zlncnt *)malloc(sizeof *zlnp);
+ if (zlnp == NULL) {
pfatal("LINK COUNT TABLE OVERFLOW");
if (reply("CONTINUE") == 0)
errexit("");
pfatal("LINK COUNT TABLE OVERFLOW");
if (reply("CONTINUE") == 0)
errexit("");
+ } else {
+ zlnp->zlncnt = inumber;
+ zlnp->next = zlnhead;
+ zlnhead = zlnp;
}
}
statemap[inumber] = DIRCT(dp) ? DSTATE : FSTATE;
}
}
statemap[inumber] = DIRCT(dp) ? DSTATE : FSTATE;
@@
-122,7
+134,9
@@
pass1()
continue;
unknown:
pfatal("UNKNOWN FILE TYPE I=%u", inumber);
continue;
unknown:
pfatal("UNKNOWN FILE TYPE I=%u", inumber);
+ statemap[inumber] = FCLEAR;
if (reply("CLEAR") == 1) {
if (reply("CLEAR") == 1) {
+ statemap[inumber] = USTATE;
zapino(dp);
inodirty();
}
zapino(dp);
inodirty();
}