From: Dave Reisner <d@falconindy.com>
To: util-linux@vger.kernel.org
Cc: Dave Reisner <dreisner@archlinux.org>
Subject: [PATCH 13/13] sulogin: add i18n strings
Date: Tue, 28 Feb 2012 11:45:21 -0500 [thread overview]
Message-ID: <1330447521-886-14-git-send-email-dreisner@archlinux.org> (raw)
In-Reply-To: <1330447521-886-1-git-send-email-dreisner@archlinux.org>
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---
login-utils/sulogin.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index 6cb075c..bed1fd3 100644
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -241,7 +241,7 @@ static struct passwd *getrootpwent(int try_manually)
* or not found, return.
*/
if (p == NULL) {
- fprintf(stderr, "%s: no entry for root\n", _PATH_PASSWD);
+ fprintf(stderr, _("%s: no entry for root\n"), _PATH_PASSWD);
return &pwd;
}
if (valid(pwd.pw_passwd))
@@ -253,7 +253,7 @@ static struct passwd *getrootpwent(int try_manually)
*/
strcpy(pwd.pw_passwd, "");
if ((fp = fopen(_PATH_SHADOW_PASSWD, "r")) == NULL) {
- fprintf(stderr, "%s: root password garbled\n", _PATH_PASSWD);
+ fprintf(stderr, _("%s: root password garbled\n"), _PATH_PASSWD);
return &pwd;
}
while ((p = fgets(sline, 256, fp)) != NULL) {
@@ -270,11 +270,11 @@ static struct passwd *getrootpwent(int try_manually)
* NULL it, and return.
*/
if (p == NULL) {
- fprintf(stderr, "%s: no entry for root\n", _PATH_SHADOW_PASSWD);
+ fprintf(stderr, _("%s: no entry for root\n"), _PATH_SHADOW_PASSWD);
strcpy(pwd.pw_passwd, "");
}
if (!valid(pwd.pw_passwd)) {
- fprintf(stderr, "%s: root password garbled\n", _PATH_SHADOW_PASSWD);
+ fprintf(stderr, _("%s: root password garbled\n"), _PATH_SHADOW_PASSWD);
strcpy(pwd.pw_passwd, "");
}
return &pwd;
@@ -293,10 +293,10 @@ static char *getpasswd(char *crypted)
size_t i;
if (crypted[0])
- printf("Give root password for maintenance\n");
+ printf(_("Give root password for maintenance\n"));
else
- printf("Press enter for maintenance");
- printf("(or type Control-D to continue): ");
+ printf(_("Press enter for maintenance"));
+ printf(_("(or type Control-D to continue): "));
fflush(stdout);
tcgetattr(0, &old);
@@ -384,7 +384,7 @@ static void sushell(struct passwd *pwd)
if (getseuserbyname("root", &seuser, &level) == 0) {
if (get_default_context_with_level(seuser, level, 0, &scon) == 0) {
if (setexeccon(scon) != 0)
- fprintf(stderr, "setexeccon failed\n");
+ fprintf(stderr, _("setexeccon failed\n"));
freecon(scon);
}
}
@@ -409,7 +409,7 @@ static void usage(FILE *out)
fprintf(out, USAGE_OPTIONS);
fprintf(out, _(
" -p start a login shell\n"
- " -t SEC set max time to wait for a password (default: no limit)\n"
+ " -t SEC max time to wait for a password (default: no limit)\n"
" -e examine shadow files directly if getpwnam(3) fails\n"
" -h display this help message\n"));
@@ -452,7 +452,8 @@ int main(int argc, char **argv)
}
if (geteuid() != 0) {
- fprintf(stderr, "sulogin: only root can run sulogin.\n");
+ fprintf(stderr, _("%s: only root can run this program.\n"),
+ program_invocation_short_name);
exit(1);
}
@@ -528,7 +529,8 @@ int main(int argc, char **argv)
* Get the root password.
*/
if ((pwd = getrootpwent(opt_e)) == NULL) {
- fprintf(stderr, "sulogin: cannot open password database!\n");
+ fprintf(stderr, _("%s: cannot open password database.\n"),
+ program_invocation_short_name);
sleep(2);
}
@@ -544,7 +546,7 @@ int main(int argc, char **argv)
mask_signal(SIGQUIT, SIG_IGN, &saved_sigquit);
mask_signal(SIGTSTP, SIG_IGN, &saved_sigtstp);
mask_signal(SIGINT, SIG_IGN, &saved_sigint);
- printf("Login incorrect.\n");
+ printf(_("Login incorrect\n"));
}
/*
--
1.7.9.2
next prev parent reply other threads:[~2012-02-28 16:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 16:45 [PATCH 00/13] Initial import of sulogin Dave Reisner
2012-02-28 16:45 ` [PATCH 01/13] fstab.5: fix misspelling of deprecated Dave Reisner
2012-02-28 16:45 ` [PATCH 02/13] sulogin: initial import from sysvinit Dave Reisner
2012-02-28 18:45 ` Davidlohr Bueso
2012-02-28 16:45 ` [PATCH 03/13] sulogin.8: refactor manpage Dave Reisner
2012-02-28 16:45 ` [PATCH 04/13] sulogin: whitespace fixes Dave Reisner
2012-02-28 16:45 ` [PATCH 05/13] sulogin: replace older signal() with sigaction() Dave Reisner
2012-02-28 16:45 ` [PATCH 06/13] sulogin: remove CHECK_{DES,MD5} defines Dave Reisner
2012-02-28 16:45 ` [PATCH 07/13] sulogin: remove USE_ONELINE and SANE_TIO defines Dave Reisner
2012-02-28 16:45 ` [PATCH 08/13] sulogin: use size_t for iterator to avoid cast Dave Reisner
2012-02-28 16:45 ` [PATCH 09/13] sulogin: get rid of calls to /bin/sash Dave Reisner
2012-02-28 16:45 ` [PATCH 10/13] sulogin: use pathnames.h for file locations Dave Reisner
2012-02-28 16:45 ` [PATCH 11/13] sulogin: header/include cleanup Dave Reisner
2012-02-28 16:45 ` [PATCH 12/13] sulogin: use a more standard usage output Dave Reisner
2012-02-28 16:45 ` Dave Reisner [this message]
2012-02-28 16:48 ` [PATCH 00/13] Initial import of sulogin Dave Reisner
2012-10-12 12:53 ` [util-linux] " Dr. Werner Fink
2012-10-12 13:23 ` Karel Zak
2012-10-12 14:07 ` Dr. Werner Fink
2012-11-09 8:38 ` Karel Zak
2012-11-09 8:45 ` Karel Zak
2012-11-09 12:09 ` Karel Zak
2012-11-30 15:57 ` Dr. Werner Fink
2012-12-04 12:12 ` Dr. Werner Fink
2012-03-12 14:20 ` sulogin merged into util-linux (Re: [PATCH 00/13] Initial import of sulogin) Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330447521-886-14-git-send-email-dreisner@archlinux.org \
--to=d@falconindy.com \
--cc=dreisner@archlinux.org \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).