From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Sun, 8 Oct 2023 18:21:04 +0000 (+0200)
Subject: login: use xasprintf
X-Git-Tag: v2.40-rc1~208^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea55bf64b231726d7e0a1067b6bbb130524185b6;p=thirdparty%2Futil-linux.git

login: use xasprintf

It is easier to use xasprintf than performing all its internals
explicitly in login's code base.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
---

diff --git a/login-utils/login.c b/login-utils/login.c
index 36956cce75..1f3f5d36c1 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -861,8 +861,7 @@ static void loginpam_err(pam_handle_t *pamh, int retcode)
 static const char *loginpam_get_prompt(struct login_context *cxt)
 {
 	const char *host;
-	char *prompt, *dflt_prompt = _("login: ");
-	size_t sz;
+	char *prompt = NULL, *dflt_prompt = _("login: ");
 
 	if (cxt->nohost)
 		return dflt_prompt;	/* -H on command line */
@@ -873,9 +872,7 @@ static const char *loginpam_get_prompt(struct login_context *cxt)
 	if (!(host = get_thishost(cxt, NULL)))
 		return dflt_prompt;
 
-	sz = strlen(host) + 1 + strlen(dflt_prompt) + 1;
-	prompt = xmalloc(sz);
-	snprintf(prompt, sz, "%s %s", host, dflt_prompt);
+	xasprintf(&prompt, "%s %s", host, dflt_prompt);
 
 	return prompt;
 }