summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Natano <natano@cvs.openbsd.org>2016-10-18 18:34:46 +0000
committerMartin Natano <natano@cvs.openbsd.org>2016-10-18 18:34:46 +0000
commit3551c8bcb4449d2cd8bafbde753d1d47b913d0e3 (patch)
treeb1ea5712c0e764a674dfdd0e977c9d891e3f4041
parent6f4149e2ad54945173f77855e3113a160af3dbfc (diff)
Remove setprogname().
-rw-r--r--usr.sbin/makefs/makefs.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index bc80beef6a8..97de938c920 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: makefs.c,v 1.10 2016/10/18 18:15:23 natano Exp $ */
+/* $OpenBSD: makefs.c,v 1.11 2016/10/18 18:34:45 natano Exp $ */
/* $NetBSD: makefs.c,v 1.53 2015/11/27 15:10:32 joerg Exp $ */
/*
@@ -89,8 +89,6 @@ main(int argc, char *argv[])
fsnode *root;
int ch, len;
- setprogname(argv[0]);
-
debug = 0;
if ((fstype = get_fstype(DEFAULT_FSTYPE)) == NULL)
errx(1, "Unknown default fs type `%s'.", DEFAULT_FSTYPE);
@@ -357,14 +355,13 @@ strsuftoll(const char *desc, const char *val, long long min, long long max)
static void
usage(fstype_t *fstype, fsinfo_t *fsoptions)
{
- const char *prog;
+ extern char *__progname;
- prog = getprogname();
fprintf(stderr,
"Usage: %s [-b free-blocks] [-f free-files] [-M minimum-size]\n"
"\t[-m maximum-size] [-O offset] [-o fs-options] [-S sector-size]\n"
"\t[-s image-size] [-T timestamp] [-t fs-type] image-file directory\n",
- prog);
+ __progname);
if (fstype) {
size_t i;