Remove dependency on xmalloc.

Remove ssh_get_progname's dependency on xmalloc, which should reduce
link order problems.  ok djm@

1 files changed, 7 insertions, 7 deletions

diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index 65e800397..f7be415ec 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/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