diff options
| author |   tobias <tobias@openbsd.org> | 2015-12-06 12:00:16 +0000 |
|---|---|---|
| committer | tobias <tobias@openbsd.org> | 2015-12-06 12:00:16 +0000 |
| commit | dab586c4356bc69a5a09d502ddf94eb5f12b0587 (patch) | |
| tree | 17428b95ed798602d121425047c09881faf43f53 /usr.sbin/crunchgen | |
| parent | Avoid out of boundary access on illegal command line arguments. (diff) | |
| download | wireguard-openbsd-dab586c4356bc69a5a09d502ddf94eb5f12b0587.tar.xz wireguard-openbsd-dab586c4356bc69a5a09d502ddf94eb5f12b0587.zip | |
Use __progname instead of manually handling argv[0].
ok deraadt, mmcc, tedu
Diffstat (limited to 'usr.sbin/crunchgen')
| -rw-r--r-- | usr.sbin/crunchgen/crunched_main.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/usr.sbin/crunchgen/crunched_main.c b/usr.sbin/crunchgen/crunched_main.c index c3f1ad0cb03..8c4095e9ae2 100644 --- a/usr.sbin/crunchgen/crunched_main.c +++ b/usr.sbin/crunchgen/crunched_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crunched_main.c,v 1.4 2014/01/11 04:43:00 deraadt Exp $ */ +/* $OpenBSD: crunched_main.c,v 1.5 2015/12/06 12:00:16 tobias Exp $ */ /* * Copyright (c) 1994 University of Maryland @@ -47,22 +47,19 @@ extern struct stub entry_points[]; int main(int argc, char *argv[], char **envp) { - char *slash, *basename; + extern char *__progname; struct stub *ep; - if (argv[0] == NULL || *argv[0] == '\0') + if (__progname == NULL || *__progname == '\0') crunched_usage(); - slash = strrchr(argv[0], '/'); - basename = slash ? slash + 1 : argv[0]; - for (ep = entry_points; ep->name != NULL; ep++) - if (!strcmp(basename, ep->name)) + if (!strcmp(__progname, ep->name)) break; if (ep->name) return ep->f(argc, argv, envp); - fprintf(stderr, "%s: %s not compiled in\n", EXECNAME, basename); + fprintf(stderr, "%s: %s not compiled in\n", EXECNAME, __progname); crunched_usage(); } |