ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wall: support --timeout switch 

The switch controls message write time out to terminals.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-04-06 21:31:04 +02:00 committed by Karel Zak
parent e89c3891a5
commit cae7485e59
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
term-utils/wall.c
View File

@ -68,6 +68,7 @@
#include "c.h"
#define IGNOREUSER "sleeper"
#define WRITE_TIME_OUT 300 /* in seconds */
#ifndef MAXHOSTNAMELEN
# ifdef HOST_NAME_MAX
@ -88,6 +89,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fprintf(out, _(
"\nOptions:\n"
" -n, --nobanner do not print banner, works only for root\n"
" -t, --timeout TIMEOUT write timeout in seconds\n"
" -V, --version output version information and exit\n"
" -h, --help display this help and exit\n\n"));
@ -105,6 +107,7 @@ main(int argc, char **argv) {
int print_banner = TRUE;
char *mbuf;
size_t mbufsize;
long timeout = WRITE_TIME_OUT;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
@ -112,12 +115,13 @@ main(int argc, char **argv) {
static const struct option longopts[] = {
{ "nobanner", no_argument, 0, 'n' },
{ "timeout", required_argument, 0, 't' },
{ "version", no_argument, 0, 'V' },
{ "help", no_argument, 0, 'h' },
{ NULL, 0, 0, 0 }
};
while ((ch = getopt_long(argc, argv, "nVh", longopts, NULL)) != -1) {
while ((ch = getopt_long(argc, argv, "nt:Vh", longopts, NULL)) != -1) {
switch (ch) {
case 'n':
if (geteuid() == 0)
@ -125,6 +129,11 @@ main(int argc, char **argv) {
else
warnx(_("--nobanner is available only for root"));
break;
case 't':
timeout = strtoll_or_err(optarg, _("invalid timeout argument"));
if (timeout < 1)
errx(EXIT_FAILURE, _("invalid timeout argument: %s"), optarg);
break;
case 'V':
printf(_("%s from %s\n"), program_invocation_short_name,
PACKAGE_STRING);
@ -161,7 +170,7 @@ main(int argc, char **argv) {
continue;
xstrncpy(line, utmpptr->ut_line, sizeof(utmpptr->ut_line));
if ((p = ttymsg(&iov, 1, line, 60*5)) != NULL)
if ((p = ttymsg(&iov, 1, line, timeout)) != NULL)
warnx("%s", p);
}
endutent();