openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-27 15:46:02 +00:00
Code Issues Projects Releases Wiki Activity

fix two sloppy error paths; ok florian millert deraadt

Browse Source
This commit is contained in:
otto
2025-02-26 06:18:56 +00:00
parent a6b86b1d53
commit 187b751d8d
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/fsck/fsutil.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: fsutil.c,v 1.24 2019/06/28 13:32:43 deraadt Exp $ */
/* $OpenBSD: fsutil.c,v 1.25 2025/02/26 06:18:56 otto Exp $ */
/* $NetBSD: fsutil.c,v 1.2 1996/10/03 20:06:31 christos Exp $ */
/*
@@ -208,6 +208,10 @@ retry:
if (stslash.st_dev == stblock.st_rdev)
hot++;
raw = rawname(newname);
if (raw == NULL) {
printf("Can't get raw name of %s\n", newname);
return (origname);
}
if (stat(raw, &stchar) == -1) {
xperror(raw);
printf("Can't stat %s\n", raw);

8
sbin/fsck_ffs/setup.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: setup.c,v 1.70 2024/02/03 18:51:57 beck Exp $ */
/* $OpenBSD: setup.c,v 1.71 2025/02/26 06:18:56 otto Exp $ */
/* $NetBSD: setup.c,v 1.27 1996/09/27 22:45:19 christos Exp $ */
/*
@@ -620,8 +620,10 @@ calcsb(char *dev, int devfd, struct fs *fs, struct disklabel *lp,
return (0);
}
cp--;
if (lp == NULL)
if (lp == NULL) {
pfatal("%s: CANNOT READ DISKLABEL\n", dev);
return (0);
}
if (isdigit((unsigned char)*cp))
pp = &lp->d_partitions[0];
else
@@ -661,7 +663,7 @@ getdisklabel(char *s, int fd)
if (ioctl(fd, DIOCGDINFO, (char *)&lab) == -1) {
if (s == NULL)
return (NULL);
pwarn("ioctl (GCINFO): %s\n", strerror(errno));
pwarn("ioctl (CGDINFO): %s\n", strerror(errno));
errexit("%s: can't read disk label\n", s);
}
return (&lab);