* libmisc/console.c, libmisc/motd.c, libmisc/setupenv.c,

libmisc/sulog.c, libmisc/hushed.c, libmisc/failure.c,
	libmisc/loginprompt.c, libmisc/ttytype.c,
	libmisc/pam_pass_non_interractive.c, src/userdel.c, src/login.c,
	lib/commonio.c, lib/commonio.h: Fix some const issues.
	* libmisc/motd.c: Avoid multi-statements lines.
	* libmisc/motd.c: Support long MOTD_FILE.
	* libmisc/list.c, lib/prototypes.h: Revert previous change.
	dup_list and is_on_list are used with members as defined for the
	group structure, and thus even if the list is not modified, the
	list elements cannot be constant strings.
	* libmisc/system.c: Avoid C++ comments.
	* src/vipw.c: WITH_TCB cannot be tested inside a gettextized
	string. Split the Usage string.
	* lib/commonio.h: Re-indent.
This commit is contained in:
nekral-guest
2010-08-21 15:32:53 +00:00
parent 6a2f349ec5
commit f7a00a2334
17 changed files with 72 additions and 42 deletions

View File

@ -83,19 +83,19 @@ static void vipwedit (const char *, int (*)(void), int (*)(void));
*/
static void usage (int status)
{
(void)
fputs (_("Usage: vipw [options]\n"
"\n"
"Options:\n"
" -g, --group edit group database\n"
" -h, --help display this help message and exit\n"
" -p, --passwd edit passwd database\n"
" -q, --quiet quiet mode\n"
" -s, --shadow edit shadow or gshadow database\n"
FILE *usageout = (E_SUCCESS != status) ? stderr : stdout;
(void) fputs (_("Usage: vipw [options]\n"
"\n"
"Options:\n"), usageout);
(void) fputs (_(" -g, --group edit group database\n"), usageout);
(void) fputs (_(" -h, --help display this help message and exit\n"), usageout);
(void) fputs (_(" -p, --passwd edit passwd database\n"), usageout);
(void) fputs (_(" -q, --quiet quiet mode\n"), usageout);
(void) fputs (_(" -s, --shadow edit shadow or gshadow database\n"), usageout);
#ifdef WITH_TCB
" -u, --user which user's tcb shadow file to edit\n"
(void) fputs (_(" -u, --user which user's tcb shadow file to edit\n"), usageout);
#endif /* WITH_TCB */
"\n"), (E_SUCCESS != status) ? stderr : stdout);
(void) fputs (_("\n"), usageout);
exit (status);
}