X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fruserpass.c;h=3097ee7f9f4be2413d7aa9dd6fec90aa88e30bae;hp=68809df411db399dc166bd3e069ad31ef3cff094;hb=1bb1f6c3f38b05060bf699ea2743f7386889bf63;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b

diff --git a/sbr/ruserpass.c b/sbr/ruserpass.c
index 68809df..3097ee7 100644
--- a/sbr/ruserpass.c
+++ b/sbr/ruserpass.c
@@ -1,4 +1,5 @@
 /*
+ * Portions of this code are
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.
  *
@@ -18,6 +19,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <pwd.h>
 #include <errno.h>
 
@@ -65,7 +67,6 @@ ruserpass(char *host, char **aname, char **apass)
     char *hdir, buf[BUFSIZ];
     int t, usedefault = 0;
     struct stat stb;
-    extern int errno;
 
     hdir = getenv("HOME");
     if (hdir == NULL)
@@ -100,7 +101,7 @@ match:
 		switch(t) {
 		case LOGIN:
 		    if (token() && *aname == 0) {
-			*aname = malloc((size_t) strlen(tokval) + 1);
+			*aname = mh_xmalloc((size_t) strlen(tokval) + 1);
 			strcpy(*aname, tokval);
 		    }
 		    break;
@@ -112,7 +113,7 @@ match:
 			goto bad;
 		    }
 		    if (token() && *apass == 0) {
-			*apass = malloc((size_t) strlen(tokval) + 1);
+			*apass = mh_xmalloc((size_t) strlen(tokval) + 1);
 			strcpy(*apass, tokval);
 		    }
 		    break;
@@ -153,7 +154,7 @@ done:
 	    myname = tmp;
 	}
 
-	*aname = malloc((size_t) strlen(myname) + 1);
+	*aname = mh_xmalloc((size_t) strlen(myname) + 1);
 	strcpy (*aname, myname);
     }
 
@@ -162,13 +163,13 @@ done:
 	char *mypass;
 
 	snprintf(prompt, sizeof(prompt), "Password (%s:%s): ", host, *aname);
-	mypass = getpass (prompt);
+	mypass = nmh_getpass(prompt);
 	
 	if (*mypass == '\0') {
 	    mypass = *aname;
 	}
 
-	*apass = malloc((size_t) strlen(mypass) + 1);
+	*apass = mh_xmalloc((size_t) strlen(mypass) + 1);
 	strcpy (*apass, mypass);
     }