d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simply printf-like strings and outdent strings so that it is easy to see

Browse Source 
if they fit on a standard terminal.
This commit is contained in:
David E. O'Brien 2012-09-12 14:59:57 +00:00
parent e5deeefec6
commit bd3c72d0d8
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sbin/fsck_ffs/main.c
View File

@ -279,8 +279,8 @@ checkfilesys(char *filesys)
exit(0);
exit(4);
} else {
pfatal("UNEXPECTED INCONSISTENCY, %s\n",
"CANNOT RUN FAST FSCK\n");
pfatal(
"UNEXPECTED INCONSISTENCY, CANNOT RUN FAST FSCK\n");
}
}
}
@ -297,8 +297,8 @@ checkfilesys(char *filesys)
pfatal("NOT MOUNTED, CANNOT RUN IN BACKGROUND\n");
} else if ((mntp->f_flags & MNT_SOFTDEP) == 0) {
bkgrdflag = 0;
pfatal("NOT USING SOFT UPDATES, %s\n",
"CANNOT RUN IN BACKGROUND");
pfatal(
"NOT USING SOFT UPDATES, CANNOT RUN IN BACKGROUND\n");
} else if ((mntp->f_flags & MNT_RDONLY) != 0) {
bkgrdflag = 0;
pfatal("MOUNTED READ-ONLY, CANNOT RUN IN BACKGROUND\n");
@ -306,8 +306,8 @@ checkfilesys(char *filesys)
if (readsb(0) != 0) {
if (sblock.fs_flags & (FS_NEEDSFSCK | FS_SUJ)) {
bkgrdflag = 0;
pfatal("UNEXPECTED INCONSISTENCY, %s\n",
"CANNOT RUN IN BACKGROUND\n");
pfatal(
"UNEXPECTED INCONSISTENCY, CANNOT RUN IN BACKGROUND\n");
}
if ((sblock.fs_flags & FS_UNCLEAN) == 0 &&
skipclean && ckclean) {
@ -315,8 +315,8 @@ checkfilesys(char *filesys)
* file system is clean;
* skip snapshot and report it clean
*/
pwarn("FILE SYSTEM CLEAN; %s\n",
"SKIPPING CHECKS");
pwarn(
"FILE SYSTEM CLEAN; SKIPPING CHECKS\n");
goto clean;
}
}
@ -328,24 +328,23 @@ checkfilesys(char *filesys)
if (stat(snapname, &snapdir) < 0) {
if (errno != ENOENT) {
bkgrdflag = 0;
pfatal("CANNOT FIND %s %s: %s, %s\n",
"SNAPSHOT DIRECTORY",
snapname, strerror(errno),
"CANNOT RUN IN BACKGROUND");
pfatal(
"CANNOT FIND SNAPSHOT DIRECTORY %s: %s, CANNOT RUN IN BACKGROUND\n",
snapname, strerror(errno));
} else if ((grp = getgrnam("operator")) == 0 ||
mkdir(snapname, 0770) < 0 ||
chown(snapname, -1, grp->gr_gid) < 0 ||
chmod(snapname, 0770) < 0) {
bkgrdflag = 0;
pfatal("CANNOT CREATE %s %s: %s, %s\n",
"SNAPSHOT DIRECTORY",
snapname, strerror(errno),
"CANNOT RUN IN BACKGROUND");
pfatal(
"CANNOT CREATE SNAPSHOT DIRECTORY %s: %s, CANNOT RUN IN BACKGROUND\n",
snapname, strerror(errno));
}
} else if (!S_ISDIR(snapdir.st_mode)) {
bkgrdflag = 0;
pfatal("%s IS NOT A DIRECTORY, %s\n", snapname,
"CANNOT RUN IN BACKGROUND");
pfatal(
"%s IS NOT A DIRECTORY, CANNOT RUN IN BACKGROUND\n",
snapname);
}
}
if (bkgrdflag) {
@ -636,8 +635,7 @@ static void
usage(void)
{
(void) fprintf(stderr,
"usage: %s [-BEFfnpry] [-b block] [-c level] [-m mode] "
"filesystem ...\n",
"usage: %s [-BEFfnpry] [-b block] [-c level] [-m mode] filesystem ...\n",
getprogname());
exit(1);
}