tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependency on xmalloc.

Browse Source 
Remove ssh_get_progname's dependency on xmalloc, which should reduce
link order problems.  ok djm@
This commit is contained in:
Darren Tucker 2015-02-26 04:12:58 +11:00
parent 5d5ec165c5
commit 678e473e2a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openbsd-compat/bsd-misc.c
View File

@ -31,8 +31,6 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include "xmalloc.h"
#ifndef HAVE___PROGNAME #ifndef HAVE___PROGNAME
char *__progname; char *__progname;
#endif #endif
@ -43,13 +41,12 @@ char *__progname;
*/ */
char *ssh_get_progname(char *argv0) char *ssh_get_progname(char *argv0)
{ {
char *p, *q;
#ifdef HAVE___PROGNAME #ifdef HAVE___PROGNAME
extern char *__progname; extern char *__progname;
return xstrdup(__progname); p = __progname;
#else #else
char *p;
if (argv0 == NULL) if (argv0 == NULL)
return ("unknown"); /* XXX */ return ("unknown"); /* XXX */
p = strrchr(argv0, '/'); p = strrchr(argv0, '/');
@ -57,9 +54,12 @@ char *ssh_get_progname(char *argv0)
p = argv0; p = argv0;
else else
p++; p++;
return (xstrdup(p));
#endif #endif
if ((q = strdup(p)) == NULL) {
perror("strdup");
exit(1);
}
return q;
} }
#ifndef HAVE_SETLOGIN #ifndef HAVE_SETLOGIN