diff options
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/fsck/fsutil.c | 6 | ||||
| -rw-r--r-- | sbin/fsck_msdos/boot.c | 16 | ||||
| -rw-r--r-- | sbin/fsck_msdos/dir.c | 8 |
3 files changed, 14 insertions, 16 deletions
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c index dfcc4b1ea3b..ecdc076ab31 100644 --- a/sbin/fsck/fsutil.c +++ b/sbin/fsck/fsutil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fsutil.c,v 1.3 2001/05/15 22:03:03 deraadt Exp $ */ +/* $OpenBSD: fsutil.c,v 1.4 2001/07/03 13:03:44 ian Exp $ */ /* $NetBSD: fsutil.c,v 1.2 1996/10/03 20:06:31 christos Exp $ */ /* @@ -116,10 +116,8 @@ vmsg(fatal, fmt, ap) (void) vprintf(fmt, ap); - if (fatal && preen) - (void) printf("\n"); - if (fatal && preen) { + (void) printf("\n"); (void) printf( "%s: UNEXPECTED INCONSISTENCY; RUN %s MANUALLY.\n", dev, __progname); diff --git a/sbin/fsck_msdos/boot.c b/sbin/fsck_msdos/boot.c index 2bffd013512..ba01bc70f5f 100644 --- a/sbin/fsck_msdos/boot.c +++ b/sbin/fsck_msdos/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.5 1999/08/30 20:27:45 espie Exp $ */ +/* $OpenBSD: boot.c,v 1.6 2001/07/03 13:03:44 ian Exp $ */ /* $NetBSD: boot.c,v 1.5 1997/10/17 11:19:23 ws Exp $ */ /* @@ -35,7 +35,7 @@ #ifndef lint -static char rcsid[] = "$OpenBSD: boot.c,v 1.5 1999/08/30 20:27:45 espie Exp $"; +static char rcsid[] = "$OpenBSD: boot.c,v 1.6 2001/07/03 13:03:44 ian Exp $"; #endif /* not lint */ #include <stdlib.h> @@ -62,7 +62,7 @@ readboot(dosfs, boot) } if (block[510] != 0x55 || block[511] != 0xaa) { - pfatal("Invalid signature in boot block: %02x%02x", block[511], block[510]); + pfatal("Invalid signature in boot block: %02x%02x\n", block[511], block[510]); return FSFATAL; } @@ -96,7 +96,7 @@ readboot(dosfs, boot) /* check version number: */ if (block[42] || block[43]) { /* Correct? XXX */ - pfatal("Unknown filesystem version: %x.%x", + pfatal("Unknown filesystem version: %x.%x\n", block[43], block[42]); return FSFATAL; } @@ -160,7 +160,7 @@ readboot(dosfs, boot) } if (memcmp(block, backup, DOSBOOTBLOCKSIZE)) { /* Correct? XXX */ - pfatal("backup doesn't compare to primary bootblock"); + pfatal("backup doesn't compare to primary bootblock\n"); return FSFATAL; } /* Check backup FSInfo? XXX */ @@ -173,11 +173,11 @@ readboot(dosfs, boot) - CLUST_FIRST * boot->SecPerClust; if (boot->BytesPerSec % DOSBOOTBLOCKSIZE != 0) { - pfatal("Invalid sector size: %u", boot->BytesPerSec); + pfatal("Invalid sector size: %u\n", boot->BytesPerSec); return (FSFATAL); } if (boot->SecPerClust == 0) { - pfatal("Invalid cluster size: %u", boot->SecPerClust); + pfatal("Invalid cluster size: %u\n", boot->SecPerClust); return (FSFATAL); } if (boot->Sectors) { @@ -194,7 +194,7 @@ readboot(dosfs, boot) else if (boot->NumClusters < (CLUST_RSRVD&CLUST16_MASK)) boot->ClustMask = CLUST16_MASK; else { - pfatal("Filesystem too big (%u clusters) for non-FAT32 partition", + pfatal("Filesystem too big (%u clusters) for non-FAT32 partition\n", boot->NumClusters); return FSFATAL; } diff --git a/sbin/fsck_msdos/dir.c b/sbin/fsck_msdos/dir.c index a335096bfcf..a5a197d88fb 100644 --- a/sbin/fsck_msdos/dir.c +++ b/sbin/fsck_msdos/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.11 1999/09/06 12:40:52 espie Exp $ */ +/* $OpenBSD: dir.c,v 1.12 2001/07/03 13:03:45 ian Exp $ */ /* $NetBSD: dir.c,v 1.11 1997/10/17 11:19:35 ws Exp $ */ /* @@ -37,7 +37,7 @@ #ifndef lint -static char rcsid[] = "$OpenBSD: dir.c,v 1.11 1999/09/06 12:40:52 espie Exp $"; +static char rcsid[] = "$OpenBSD: dir.c,v 1.12 2001/07/03 13:03:45 ian Exp $"; #endif /* not lint */ #include <stdio.h> @@ -246,7 +246,7 @@ resetDosDirSection(boot, fat) (void)memset(rootDir, 0, sizeof *rootDir); if (boot->flags & FAT32) { if (boot->RootCl < CLUST_FIRST || boot->RootCl >= boot->NumClusters) { - pfatal("Root directory starts with cluster out of range(%u)", + pfatal("Root directory starts with cluster out of range(%u)\n", boot->RootCl); return (FSFATAL); } @@ -260,7 +260,7 @@ resetDosDirSection(boot, fat) pwarn("Root directory starts with cluster marked %s\n", rsrvdcltype(cl)); else { - pfatal("Root directory doesn't start a cluster chain"); + pfatal("Root directory doesn't start a cluster chain\n"); return (FSFATAL); } if (ask(1, "Fix")) { |