diff options
Diffstat (limited to 'usr/src/lib/libpkg/common/verify.c')
| -rw-r--r-- | usr/src/lib/libpkg/common/verify.c | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/usr/src/lib/libpkg/common/verify.c b/usr/src/lib/libpkg/common/verify.c index c48c5b8c77..3329d9aff2 100644 --- a/usr/src/lib/libpkg/common/verify.c +++ b/usr/src/lib/libpkg/common/verify.c @@ -106,7 +106,6 @@ reperr(char *fmt, ...) ptln = sizeof (theErrBuf); } va_start(ap, fmt); - /* LINTED variable format specifier to vsnprintf() */ (void) vsnprintf(pt, ptln, fmt, ap); va_end(ap); } @@ -421,7 +420,7 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) /* Get copy of the current working directory */ if (getcwd(cwd, MAXPATHLEN) == NULL) { - reperr(pkg_gt(ERR_GETWD), ainfo->local); + reperr(pkg_gt(ERR_GETWD)); return (VE_FAIL); } @@ -434,7 +433,7 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) if (c) { /* bugid 4247895 */ if (strcmp(cd, c) == 0) - strcpy(cd, "/"); + (void) strcpy(cd, "/"); else *c = NULL; @@ -454,7 +453,7 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) * directory. */ if (!isdir(ainfo->local)) { - chdir(cwd); + (void) chdir(cwd); reperr(pkg_gt(ERR_LINKISDIR), ainfo->local); return (VE_FAIL); @@ -464,7 +463,7 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) return (VE_FAIL); if (link(ainfo->local, path)) { - chdir(cwd); + (void) chdir(cwd); reperr(pkg_gt(ERR_LINKFAIL), ainfo->local); return (VE_FAIL); @@ -660,11 +659,7 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) } if (mknod(path, ainfo->mode | S_IFCHR, -#ifdef SUNOS41 - makedev(ainfo->xmajor, ainfo->xminor)) || -#else makedev(ainfo->major, ainfo->minor)) || -#endif (stat(path, &status) < 0)) { reperr(pkg_gt(ERR_CDEVFAIL)); return (VE_FAIL); @@ -694,11 +689,7 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) } if (mknod(path, ainfo->mode | S_IFBLK, -#ifdef SUNOS41 - makedev(ainfo->xmajor, ainfo->xminor)) || -#else makedev(ainfo->major, ainfo->minor)) || -#endif (stat(path, &status) < 0)) { reperr(pkg_gt(ERR_BDEVFAIL)); return (VE_FAIL); @@ -723,19 +714,6 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) retcode = 0; if ((myftype == 'c') || (myftype == 'b')) { -#ifdef SUNOS41 - if (setval || (ainfo->xmajor < 0)) - ainfo->xmajor = ((status.st_rdev>>8)&0377); - if (setval || (ainfo->xminor < 0)) - ainfo->xminor = (status.st_rdev&0377); - /* check major & minor */ - if (status.st_rdev != makedev(ainfo->xmajor, ainfo->xminor)) { - reperr(pkg_gt(ERR_MAJMIN), ainfo->xmajor, - ainfo->xminor, - (status.st_rdev>>8)&0377, status.st_rdev&0377); - retcode = VE_CONT; - } -#else if (setval || (ainfo->major == BADMAJOR)) ainfo->major = major(status.st_rdev); if (setval || (ainfo->minor == BADMINOR)) @@ -746,7 +724,6 @@ averify(int fix, char *ftype, char *path, struct ainfo *ainfo) major(status.st_rdev), minor(status.st_rdev)); retcode = VE_CONT; } -#endif } /* compare specified mode w/ actual mode excluding sticky bit */ |