diff options
| author | Garrett D'Amore <garrett@nexenta.com> | 2010-11-15 20:03:27 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@nexenta.com> | 2010-11-15 20:03:27 -0800 |
| commit | 4656d4747c8743290bfbe910c64cd75eb4e4af8d (patch) | |
| tree | 241d8b3f0b8796e33937c6a27c670eba002f8f04 /usr/src/lib/libpkg/common/pkgmount.c | |
| parent | 60bec29ea42d65ac648c69b0fb189273e286ca57 (diff) | |
| download | illumos-gate-4656d4747c8743290bfbe910c64cd75eb4e4af8d.tar.gz | |
420 remove patch (sparse package) support from svr4 pkg
421 libpkg and libadm need to be lint clean
Reviewed by: gwr@nexenta.com
Reviewed by: peter.tribble@gmail.com
Approved by: gwr@nexenta.com
Diffstat (limited to 'usr/src/lib/libpkg/common/pkgmount.c')
| -rw-r--r-- | usr/src/lib/libpkg/common/pkgmount.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/lib/libpkg/common/pkgmount.c b/usr/src/lib/libpkg/common/pkgmount.c index e3c560ec70..1b64f0adc5 100644 --- a/usr/src/lib/libpkg/common/pkgmount.c +++ b/usr/src/lib/libpkg/common/pkgmount.c @@ -43,7 +43,6 @@ #include "pkglibmsgs.h" #include "pkglocale.h" -extern void quit(int retcode); /* Expected to be declared by caller! */ /* libadm.a */ extern int getvol(char *device, char *label, int options, char *prompt); @@ -63,16 +62,16 @@ pkgmount(struct pkgdev *devp, char *pkg, int part, int nparts, int getvolflg) if (part && nparts) { if (pkg) { - (void) sprintf(prompt, pkg_gt(LABEL0), part, - nparts, pkg); + (void) snprintf(prompt, sizeof (prompt), + pkg_gt(LABEL0), part, nparts, pkg); } else { - (void) sprintf(prompt, pkg_gt(LABEL1), part, - nparts); + (void) snprintf(prompt, sizeof (prompt), + pkg_gt(LABEL1), part, nparts); } } else if (pkg) - (void) sprintf(prompt, pkg_gt(LABEL2), pkg); + (void) snprintf(prompt, sizeof (prompt), pkg_gt(LABEL2), pkg); else - (void) sprintf(prompt, pkg_gt(LABEL3)); + (void) snprintf(prompt, sizeof (prompt), pkg_gt(LABEL3)); n = 0; for (;;) { @@ -96,7 +95,8 @@ pkgmount(struct pkgdev *devp, char *pkg, int part, int nparts, int getvolflg) } if (devp->fstyp == NULL) { - (void) sprintf(cmd, "%s %s", FSTYP, devp->bdevice); + (void) snprintf(cmd, sizeof (cmd), + "%s %s", FSTYP, devp->bdevice); if ((pp = epopen(cmd, "r")) == NULL) { rpterr(); logerr(pkg_gt(ERR_FSTYP), devp->bdevice); @@ -158,7 +158,7 @@ pkgumount(struct pkgdev *devp) if (n != 0) { progerr(pkg_gt("retrying umount of %s"), devp->bdevice); - sleep(5); + (void) sleep(5); } } if (n == 0) |