From: Karel Zak <kzak@redhat.com>
Date: Tue, 14 May 2013 21:29:09 +0000 (+0200)
Subject: sulogin: clean up error messages
X-Git-Tag: v2.24-rc1~552
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b3624ca21cc253da048b39eaeb3613fe5426536;p=thirdparty%2Futil-linux.git

sulogin: clean up error messages

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index 71308583c3..32ae9a20d1 100644
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -602,7 +602,7 @@ static char *getpasswd(struct console *con)
 			case ENOENT:
 				break;
 			default:
-				fprintf(stderr, "sulogin: read(%s): %m\n\r", con->tty);
+				warn(_("%s: read failed"), con->tty);
 				break;
 			}
 			goto quit;
@@ -868,7 +868,7 @@ int main(int argc, char **argv)
 	if (list_empty(&consoles)) {
 		if (!errno)
 			errno = ENOENT;
-		errx(EXIT_FAILURE, _("cannot open console: %m\n"));
+		err(EXIT_FAILURE, _("cannot open console"));
 	}
 
 	/*
@@ -934,7 +934,7 @@ int main(int argc, char **argv)
 					const char *cryptbuf;
 					cryptbuf = crypt(answer, passwd);
 					if (cryptbuf == NULL)
-						warnx(_("crypt failed: %m\n"));
+						warn(_("crypt failed"));
 					else if (strcmp(cryptbuf, pwd->pw_passwd) == 0)
 						doshell++;
 				}
@@ -965,7 +965,7 @@ int main(int argc, char **argv)
 			 */
 			exit(0);
 		case -1:
-			warnx(_("Can not fork: %m\n"));
+			warn(_("fork failed"));
 			/* fall through */
 		default:
 			break;