35c35
< static const char sccsid[] = "@(#)setup.c 8.2 (Berkeley) 2/21/94";
---
> static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95";
41,42d40
< #include <ufs/ufs/dinode.h>
< #include <ufs/ffs/fs.h>
46a45,50
>
> #include <ufs/ufs/dinode.h>
> #include <ufs/ffs/fs.h>
>
> #include <ctype.h>
> #include <err.h>
51c55
< #include <ctype.h>
---
>
58,61c62,65
< static int readsb __P((int listerr));
< static void badsb __P((int listerr, char *s));
< static int calcsb __P((char *dev, int devfd, struct fs *fs));
< static struct disklabel * getdisklabel __P((char *s, int fd));
---
> static void badsb __P((int listerr, char *s));
> static int calcsb __P((char *dev, int devfd, struct fs *fs));
> static struct disklabel *getdisklabel __P((char *s, int fd));
> static int readsb __P((int listerr));
63c67,71
<
---
> /*
> * Read in a superblock finding an alternate if necessary.
> * Return 1 if successful, 0 if unsuccessful, -1 if filesystem
> * is already clean (preen mode only).
> */
69c77
< long bmapsize;
---
> long skipclean, bmapsize;
76a85
> skipclean = preen;
107c116
< errexit("cannot allocate space for superblock\n");
---
> errx(EEXIT, "cannot allocate space for superblock");
116a126
> skipclean = 0;
139a150,153
> if (skipclean && sblock.fs_clean) {
> pwarn("FILESYSTEM CLEAN; SKIPPING CHECKS\n");
> return (-1);
> }
226c240
< (char *)(&sblock.fs_link);
---
> (char *)(&sblock.fs_firstfield);
228c242
< (u_char *)(&sblock.fs_link);
---
> (u_char *)(&sblock.fs_firstfield);
234,236c248,249
< if (asblk.b_dirty) {
< bcopy((char *)&sblock, (char *)&altsblock,
< (size_t)sblock.fs_sbsize);
---
> if (asblk.b_dirty && !bflag) {
> memmove(&altsblock, &sblock, (size_t)sblock.fs_sbsize);
252c265
< errexit("");
---
> exit(EEXIT);
300c313
< ckfini();
---
> ckfini(0);
311c324
< daddr_t super = bflag ? bflag : SBOFF / dev_bsize;
---
> ufs_daddr_t super = bflag ? bflag : SBOFF / dev_bsize;
351,352c364,365
< altsblock.fs_link = sblock.fs_link;
< altsblock.fs_rlink = sblock.fs_rlink;
---
> altsblock.fs_firstfield = sblock.fs_firstfield;
> altsblock.fs_unused_1 = sblock.fs_unused_1;
365,370c378,382
< bcopy((char *)sblock.fs_csp, (char *)altsblock.fs_csp,
< sizeof sblock.fs_csp);
< bcopy((char *)sblock.fs_fsmnt, (char *)altsblock.fs_fsmnt,
< sizeof sblock.fs_fsmnt);
< bcopy((char *)sblock.fs_sparecon, (char *)altsblock.fs_sparecon,
< sizeof sblock.fs_sparecon);
---
> memmove(altsblock.fs_csp, sblock.fs_csp, sizeof sblock.fs_csp);
> altsblock.fs_maxcluster = sblock.fs_maxcluster;
> memmove(altsblock.fs_fsmnt, sblock.fs_fsmnt, sizeof sblock.fs_fsmnt);
> memmove(altsblock.fs_sparecon,
> sblock.fs_sparecon, sizeof sblock.fs_sparecon);
377a390
> altsblock.fs_state = sblock.fs_state;
382c395,409
< if (bcmp((char *)&sblock, (char *)&altsblock, (int)sblock.fs_sbsize)) {
---
> if (memcmp(&sblock, &altsblock, (int)sblock.fs_sbsize)) {
> if (debug) {
> long *nlp, *olp, *endlp;
>
> printf("superblock mismatches\n");
> nlp = (long *)&altsblock;
> olp = (long *)&sblock;
> endlp = olp + (sblock.fs_sbsize / sizeof *olp);
> for ( ; olp < endlp; olp++, nlp++) {
> if (*olp == *nlp)
> continue;
> printf("offset %d, original %d, alternate %d\n",
> olp - (long *)&sblock, *olp, *nlp);
> }
> }
410c437
< int
---
> static int
421c448
< cp = index(dev, '\0') - 1;
---
> cp = strchr(dev, '\0') - 1;
437c464
< bzero((char *)fs, sizeof(struct fs));
---
> memset(fs, 0, sizeof(struct fs));
464c491
< struct disklabel *
---
> static struct disklabel *
475c502
< errexit("%s: can't read disk label\n", s);
---
> errx(EEXIT, "%s: can't read disk label", s);