lib/agetpass.*: Move allocation to helper macro

This is in preparation for the following commit.

Signed-off-by: Alejandro Colomar <[email protected]>

lib/agetpass.c

@@ -8,4 +8,5 @@
 
 
 extern inline void erase_pass(char *pass);
-extern inline char *agetpass_internal(const char *prompt, int flags);
+extern inline char *getpass_(char pass[PASS_MAX + 2], const char *prompt,
+    int flags);

lib/agetpass.h

@@ -8,8 +8,10 @@
 
 #include <config.h>
 
+#include <errno.h>
 #include <limits.h>
 #include <readpassphrase.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -21,21 +23,25 @@
 
 
 // Similar to getpass(3), but free of its problems.
-#define agetpass(prompt)  agetpass_internal(prompt, RPP_REQUIRE_TTY)
-#define agetpass_stdin()  agetpass_internal(NULL, RPP_STDIN)
+#define agetpass(prompt)  agetpass_(prompt, RPP_REQUIRE_TTY)
+#define agetpass_stdin()  agetpass_(NULL, RPP_STDIN)
+
+#define agetpass_(...)    getpass_(MALLOC(PASS_MAX + 2, char), __VA_ARGS__)
 
 
 inline void erase_pass(char *pass);
 ATTR_MALLOC(erase_pass)
-inline char *agetpass_internal(const char *prompt, int flags);
+inline char *getpass_(char pass[PASS_MAX + 2], const char *prompt, int flags);
 
 
 inline char *
-agetpass_internal(const char *prompt, int flags)
+getpass_(char pass[PASS_MAX + 2], const char *prompt, int flags)
 {
-	char    *pass;
 	size_t  len;
 
+	if (pass == NULL)
+		return NULL;
+
 	/*
 	 * Since we want to support passwords upto PASS_MAX, we need
 	 * PASS_MAX bytes for the password itself, and one more byte for
@@ -44,10 +50,6 @@ agetpass_internal(const char *prompt, int flags)
 	 * Let's add one more byte, and if the password uses it, it
 	 * means the introduced password was longer than PASS_MAX.
 	 */
-	pass = MALLOC(PASS_MAX + 2, char);
-	if (pass == NULL)
-		return NULL;
-
 	if (readpassphrase(prompt, pass, PASS_MAX + 2, flags) == NULL)
 		goto fail;