35c35
< static const char sccsid[] = "@(#)utilities.c 8.1 (Berkeley) 6/5/93";
---
> static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95";
39a40
>
47a49,51
> #include <ctype.h>
> #include <err.h>
>
52c56
< static void rwerror __P((char *mesg, daddr_t blk));
---
> static void rwerror __P((char *mesg, ufs_daddr_t blk));
122c126
< errexit("cannot allocate buffer pool\n");
---
> errx(EEXIT, "cannot allocate buffer pool");
135c139
< errexit("cannot allocate buffer pool\n");
---
> errx(EEXIT, "cannot allocate buffer pool");
152c156
< daddr_t blkno;
---
> ufs_daddr_t blkno;
164c168
< errexit("deadlocked buffer pool\n");
---
> errx(EEXIT, "deadlocked buffer pool");
182c186
< daddr_t blk;
---
> ufs_daddr_t blk;
185c189
< daddr_t dblk;
---
> ufs_daddr_t dblk;
223c227
< void
---
> static void
226c230
< daddr_t blk;
---
> ufs_daddr_t blk;
233c237
< errexit("Program terminated\n");
---
> exit(EEXIT);
237c241,242
< ckfini()
---
> ckfini(markclean)
> int markclean;
240c245
< int cnt = 0;
---
> int ofsmodified, cnt = 0;
263c268
< errexit("Panic: lost %d buffers\n", bufhead.b_size - cnt);
---
> errx(EEXIT, "Panic: lost %d buffers", bufhead.b_size - cnt);
264a270,278
> if (markclean && sblock.fs_clean == 0) {
> sblock.fs_clean = 1;
> sbdirty();
> ofsmodified = fsmodified;
> flush(fswritefd, &sblk);
> fsmodified = ofsmodified;
> if (!preen)
> printf("\n***** FILE SYSTEM MARKED CLEAN *****\n");
> }
276c290
< daddr_t blk;
---
> ufs_daddr_t blk;
293c307
< bzero(buf, (size_t)size);
---
> memset(buf, 0, (size_t)size);
315c329
< daddr_t blk;
---
> ufs_daddr_t blk;
348c362
< int
---
> ufs_daddr_t
381c395
< daddr_t blkno;
---
> ufs_daddr_t blkno;
414c428
< bzero((char *)&idesc, sizeof(struct inodesc));
---
> memset(&idesc, 0, sizeof(struct inodesc));
438c452
< bcopy(namebuf, cp, (size_t)len);
---
> memmove(cp, namebuf, (size_t)len);
447c461
< bcopy(cp, namebuf, (size_t)(&namebuf[MAXPATHLEN] - cp));
---
> memmove(namebuf, cp, (size_t)(&namebuf[MAXPATHLEN] - cp));
451,452c465,466
< catch(x)
< int x;
---
> catch(sig)
> int sig;
455c469
< ckfini();
---
> ckfini(0);
465,466c479,480
< catchquit(x)
< int x;
---
> catchquit(sig)
> int sig;
478,479c492,493
< voidquit(x)
< int x;
---
> voidquit(sig)
> int sig;
523,524c537
< errexit("UNKNOWN INODESC FIX MODE %d\n", idesc->id_fix);
< return (0);
---
> errx(EEXIT, "UNKNOWN INODESC FIX MODE %d", idesc->id_fix);
526a540
> return (0);
529,538c543,547
< /* VARARGS1 */
< void
< errexit(const char *s1, ...)
< {
< va_list ap;
< va_start(ap,s1);
< vfprintf(stdout, s1, ap);
< va_end(ap);
< exit(8);
< }
---
> #if __STDC__
> #include <stdarg.h>
> #else
> #include <varargs.h>
> #endif
544d552
< /* VARARGS1 */
546c554,560
< pfatal(const char *s, ...)
---
> #if __STDC__
> pfatal(const char *fmt, ...)
> #else
> pfatal(fmt, va_alist)
> char *fmt;
> va_dcl
> #endif
548d561
<
550,557c563,571
< va_start(ap,s);
< if (preen) {
< printf("%s: ", cdevname);
< vfprintf(stdout, s, ap);
< printf("\n");
< printf("%s: UNEXPECTED INCONSISTENCY; RUN fsck MANUALLY.\n",
< cdevname);
< exit(8);
---
> #if __STDC__
> va_start(ap, fmt);
> #else
> va_start(ap);
> #endif
> if (!preen) {
> (void)vfprintf(stderr, fmt, ap);
> va_end(ap);
> return;
559,560c573,578
< vfprintf(stdout, s, ap);
< va_end(ap);
---
> (void)fprintf(stderr, "%s: ", cdevname);
> (void)vfprintf(stderr, fmt, ap);
> (void)fprintf(stderr,
> "\n%s: UNEXPECTED INCONSISTENCY; RUN fsck MANUALLY.\n",
> cdevname);
> exit(EEXIT);
567d584
< /* VARARGS1 */
569c586,592
< pwarn(const char *s, ...)
---
> #if __STDC__
> pwarn(const char *fmt, ...)
> #else
> pwarn(fmt, va_alist)
> char *fmt;
> va_dcl
> #endif
572c595,599
< va_start(ap,s);
---
> #if __STDC__
> va_start(ap, fmt);
> #else
> va_start(ap);
> #endif
574,575c601,602
< printf("%s: ", cdevname);
< vfprintf(stdout, s, ap);
---
> (void)fprintf(stderr, "%s: ", cdevname);
> (void)vfprintf(stderr, fmt, ap);
579d605
< #ifndef lint
584c610
< #ifdef __STDC__
---
> #if __STDC__
588a615
> va_dcl
591c618,623
<
---
> va_list ap;
> #if __STDC__
> va_start(ap, fmt);
> #else
> va_start(ap);
> #endif
593c625,627
< errexit(fmt);
---
> (void)vfprintf(stderr, fmt, ap);
> va_end(ap);
> exit(EEXIT);
595d628
< #endif