diff options
| author | des <des@FreeBSD.org> | 2016-01-19 18:28:23 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-19 18:28:23 +0000 |
| commit | 7a7bc643b5dd94f6333f2a1d91923165ad77176f (patch) | |
| tree | 9d2b367395b2d3c9a63b4aecd1eb28b17b838703 /crypto/openssh/openbsd-compat/bsd-misc.c | |
| parent | 834fb5aff44e0a606772591d869016a1d8d9aa95 (diff) | |
| parent | 928d872bfcc9d49be194dc51d80555f1bbdbff6b (diff) | |
| download | FreeBSD-src-7a7bc643b5dd94f6333f2a1d91923165ad77176f.zip FreeBSD-src-7a7bc643b5dd94f6333f2a1d91923165ad77176f.tar.gz | |
Upgrade to OpenSSH 6.8p1.
Diffstat (limited to 'crypto/openssh/openbsd-compat/bsd-misc.c')
| -rw-r--r-- | crypto/openssh/openbsd-compat/bsd-misc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/openssh/openbsd-compat/bsd-misc.c b/crypto/openssh/openbsd-compat/bsd-misc.c index 65e8003..f7be415 100644 --- a/crypto/openssh/openbsd-compat/bsd-misc.c +++ b/crypto/openssh/openbsd-compat/bsd-misc.c @@ -31,8 +31,6 @@ #include <time.h> #include <unistd.h> -#include "xmalloc.h" - #ifndef HAVE___PROGNAME char *__progname; #endif @@ -43,13 +41,12 @@ char *__progname; */ char *ssh_get_progname(char *argv0) { + char *p, *q; #ifdef HAVE___PROGNAME extern char *__progname; - return xstrdup(__progname); + p = __progname; #else - char *p; - if (argv0 == NULL) return ("unknown"); /* XXX */ p = strrchr(argv0, '/'); @@ -57,9 +54,12 @@ char *ssh_get_progname(char *argv0) p = argv0; else p++; - - return (xstrdup(p)); #endif + if ((q = strdup(p)) == NULL) { + perror("strdup"); + exit(1); + } + return q; } #ifndef HAVE_SETLOGIN |
