summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pkg_install/info/perform.c
diff options
context:
space:
mode:
authorcharnier <charnier@FreeBSD.org>1997-10-08 07:48:21 +0000
committercharnier <charnier@FreeBSD.org>1997-10-08 07:48:21 +0000
commit1c390186cd64897d9b1b87cb01152be10cc44005 (patch)
treefafe85eadca3db5f2091738324c5253d4072cf3e /usr.sbin/pkg_install/info/perform.c
parentad57db7eefbd5760a834879d200ce1043f86046d (diff)
downloadFreeBSD-src-1c390186cd64897d9b1b87cb01152be10cc44005.zip
FreeBSD-src-1c390186cd64897d9b1b87cb01152be10cc44005.tar.gz
Use err(3). Cosmetics in usage string and man page.
Diffstat (limited to 'usr.sbin/pkg_install/info/perform.c')
-rw-r--r--usr.sbin/pkg_install/info/perform.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c
index b9b13b8..25d0328 100644
--- a/usr.sbin/pkg_install/info/perform.c
+++ b/usr.sbin/pkg_install/info/perform.c
@@ -1,5 +1,6 @@
#ifndef lint
-static const char *rcsid = "$Id$";
+static const char rcsid[] =
+ "$Id: perform.c,v 1.21 1997/02/22 16:09:42 peter Exp $";
#endif
/*
@@ -112,13 +113,13 @@ pkg_do(char *pkg)
* be very optimistic.
*/
if (stat(fname, &sb) == FAIL) {
- whinge("Can't stat package file '%s'.", fname);
+ warnx("can't stat package file '%s'", fname);
code = 1;
goto bail;
}
Home = make_playpen(PlayPen, sb.st_size / 2);
if (unpack(fname, "+*")) {
- whinge("Error during unpacking, no info for '%s' available.", pkg);
+ warnx("error during unpacking, no info for '%s' available", pkg);
code = 1;
goto bail;
}
@@ -130,11 +131,11 @@ pkg_do(char *pkg)
sprintf(log_dir, "%s/%s", (tmp = getenv(PKG_DBDIR)) ? tmp : DEF_LOG_DIR,
pkg);
if (!fexists(log_dir)) {
- whinge("Can't find package `%s' installed or in a file!", pkg);
+ warnx("can't find package `%s' installed or in a file!", pkg);
return 1;
}
if (chdir(log_dir) == FAIL) {
- whinge("Can't change directory to '%s'!", log_dir);
+ warnx("can't change directory to '%s'!", log_dir);
return 1;
}
installed = TRUE;
@@ -144,7 +145,7 @@ pkg_do(char *pkg)
plist.head = plist.tail = NULL;
fp = fopen(CONTENTS_FNAME, "r");
if (!fp) {
- whinge("Unable to open %s file.", CONTENTS_FNAME);
+ warnx("unable to open %s file", CONTENTS_FNAME);
code = 1;
goto bail;
}
OpenPOWER on IntegriCloud