diff options
| author | djm <djm> | 2014-08-21 05:54:50 +0000 |
|---|---|---|
| committer | djm <djm> | 2014-08-21 05:54:50 +0000 |
| commit | a86618cfec140411732819ee8625929d0478a18d (patch) | |
| tree | 462c6ddbda2d9e854042abdb5bdf2c6b9030008f | |
| parent | c28163efeb1bd7fc01a11cee883def5c67784249 (diff) | |
| download | openssh-a86618cfec140411732819ee8625929d0478a18d.tar.gz | |
- (djm) [regress/unittests/test_helper/test_helper.c] Fix for systems that
don't set __progname. Diagnosed by Tom Christensen.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | regress/unittests/test_helper/test_helper.c | 13 |
2 files changed, 15 insertions, 0 deletions
@@ -1,6 +1,8 @@ 20140821 - (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too. - (djm) [key.h] Fix ifdefs for no-ECC OpenSSL + - (djm) [regress/unittests/test_helper/test_helper.c] Fix for systems that + don't set __progname. Diagnosed by Tom Christensen. 20140820 - (djm) [configure.ac] Check OpenSSL version is supported at configure time; diff --git a/regress/unittests/test_helper/test_helper.c b/regress/unittests/test_helper/test_helper.c index 6faf99e5..d0bc6783 100644 --- a/regress/unittests/test_helper/test_helper.c +++ b/regress/unittests/test_helper/test_helper.c @@ -117,6 +117,19 @@ main(int argc, char **argv) { int ch; + /* Handle systems without __progname */ + if (__progname == NULL) { + __progname = strrchr(argv[0], '/'); + if (__progname == NULL || __progname[1] == '\0') + __progname = argv[0]; + else + __progname++; + if ((__progname = strdup(__progname)) == NULL) { + fprintf(stderr, "strdup failed\n"); + exit(1); + } + } + while ((ch = getopt(argc, argv, "vqd:")) != -1) { switch (ch) { case 'd': |