diff options
| author |   natano <natano@openbsd.org> | 2016-10-18 18:34:45 +0000 |
|---|---|---|
| committer | natano <natano@openbsd.org> | 2016-10-18 18:34:45 +0000 |
| commit | 13279cb7ceb369ed8d58060b5a70a5d0961e7033 (patch) | |
| tree | df428e1e6b495a358b57c569d8fc808172bf3b4a /usr.sbin/makefs | |
| parent | Only allow epoch timestamps for -T. A shared option for either using the (diff) | |
| download | wireguard-openbsd-13279cb7ceb369ed8d58060b5a70a5d0961e7033.tar.xz wireguard-openbsd-13279cb7ceb369ed8d58060b5a70a5d0961e7033.zip | |
Remove setprogname().
Diffstat (limited to 'usr.sbin/makefs')
| -rw-r--r-- | usr.sbin/makefs/makefs.c | 9 |
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; |