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
date and time created 88/10/19 10:35:42 by bostic
[unix-history]
/
usr
/
src
/
sbin
/
badsect
/
badsect.c
diff --git
a/usr/src/sbin/badsect/badsect.c
b/usr/src/sbin/badsect/badsect.c
index
3a3f1d9
..
50d2d2d
100644
(file)
--- a/
usr/src/sbin/badsect/badsect.c
+++ b/
usr/src/sbin/badsect/badsect.c
@@
-11,7
+11,7
@@
char copyright[] =
#endif not lint
#ifndef lint
#endif not lint
#ifndef lint
-static char sccsid[] = "@(#)badsect.c 5.
1
(Berkeley) %G%";
+static char sccsid[] = "@(#)badsect.c 5.
4
(Berkeley) %G%";
#endif not lint
/*
#endif not lint
/*
@@
-44,6
+44,7
@@
union {
struct fs *fs;
int fso, fsi;
int errs;
struct fs *fs;
int fso, fsi;
int errs;
+long dev_bsize = 1;
char buf[MAXBSIZE];
char buf[MAXBSIZE];
@@
-93,7
+94,8
@@
main(argc, argv)
exit(6);
}
fs = &sblock;
exit(6);
}
fs = &sblock;
- rdfs(SBLOCK, SBSIZE, (char *)fs);
+ rdfs(SBOFF, SBSIZE, (char *)fs);
+ dev_bsize = fs->fs_fsize / fsbtodb(fs, 1);
for (argc -= 2, argv += 2; argc > 0; argc--, argv++) {
number = atoi(*argv);
if (chkuse(number, 1))
for (argc -= 2, argv += 2; argc > 0; argc--, argv++) {
number = atoi(*argv);
if (chkuse(number, 1))
@@
-135,13
+137,13
@@
chkuse(blkno, cnt)
}
rdfs(fsbtodb(fs, cgtod(fs, cg)), (int)sblock.fs_cgsize,
(char *)&acg);
}
rdfs(fsbtodb(fs, cgtod(fs, cg)), (int)sblock.fs_cgsize,
(char *)&acg);
- if (
acg.cg_magic != CG_MAGIC
) {
+ if (
!cg_chkmagic(&acg)
) {
fprintf(stderr, "cg %d: bad magic number\n", cg);
errs++;
fprintf(stderr, "cg %d: bad magic number\n", cg);
errs++;
- return;
+ return
(1)
;
}
bn = dtogd(fs, fsbn);
}
bn = dtogd(fs, fsbn);
- if (isclr(
acg.cg_free
, bn))
+ if (isclr(
cg_blksfree(&acg)
, bn))
printf("Warning: sector %d is in use\n", blkno);
return (0);
}
printf("Warning: sector %d is in use\n", blkno);
return (0);
}
@@
-155,7
+157,7
@@
rdfs(bno, size, bf)
{
int n;
{
int n;
- if (lseek(fsi, bno *
DEV_BSIZE
, 0) < 0) {
+ if (lseek(fsi, bno *
dev_bsize
, 0) < 0) {
printf("seek error: %ld\n", bno);
perror("rdfs");
exit(1);
printf("seek error: %ld\n", bno);
perror("rdfs");
exit(1);