From ea152b4e9656945f17d18bf4e5ece91e3e57ebb1 Mon Sep 17 00:00:00 2001

From: Karel Zak <kzak@redhat.com>

Date: Tue, 29 Jan 2019 11:57:55 +0100

Subject: [PATCH] agetty: backport RHEL-8 version

The code is identical to RHEL-8.0, except:

 * disabled ISSUEDIR_SUPPORT

 * disabled AGETTY_RELOAD

 * removed \e and \e{name} feature

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1664752

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

---

 include/pathnames.h |    5 +-

 term-utils/agetty.c | 1141 +++++++++++++++++++++++++++++++------------

 2 files changed, 839 insertions(+), 307 deletions(-)

diff --git a/include/pathnames.h b/include/pathnames.h

index fa4bddbad..ec5eef918 100644

--- a/include/pathnames.h

+++ b/include/pathnames.h

@@ -64,9 +64,10 @@

 /* used in term-utils/agetty.c */

 #define _PATH_ISSUE		"/etc/issue"

-#define _PATH_OS_RELEASE	"/etc/os-release"

+#define _PATH_ISSUEDIR		_PATH_ISSUE ".d"

+#define _PATH_OS_RELEASE_ETC	"/etc/os-release"

+#define _PATH_OS_RELEASE_USR	"/usr/lib/os-release"

 #define _PATH_NUMLOCK_ON	_PATH_LOCALSTATEDIR "/numlock-on"

-

 #define _PATH_LOGINDEFS		"/etc/login.defs"

 /* used in misc-utils/look.c */

diff --git a/term-utils/agetty.c b/term-utils/agetty.c

index 948d77246..c3c7ab504 100644

--- a/term-utils/agetty.c

+++ b/term-utils/agetty.c

@@ -10,6 +10,7 @@

  *

  * This program is freely distributable.

  */

+

 #include <stdio.h>

 #include <unistd.h>

 #include <stdlib.h>

@@ -20,19 +21,21 @@

 #include <sys/ioctl.h>

 #include <sys/types.h>

 #include <sys/stat.h>

+#include <sys/wait.h>

 #include <fcntl.h>

 #include <stdarg.h>

 #include <ctype.h>

-#include <utmp.h>

+#include <utmpx.h>

 #include <getopt.h>

 #include <time.h>

-#include <sys/file.h>

 #include <sys/socket.h>

 #include <langinfo.h>

 #include <grp.h>

 #include <arpa/inet.h>

 #include <netdb.h>

 #include <ifaddrs.h>

+#include <net/if.h>

+#include <sys/utsname.h>

 #include "strutils.h"

 #include "all-io.h"

@@ -41,14 +44,37 @@

 #include "c.h"

 #include "widechar.h"

 #include "ttyutils.h"

+#include "env.h"

+

+#ifdef USE_PLYMOUTH_SUPPORT

+# include "plymouth-ctrl.h"

+#endif

+

+#ifdef HAVE_SYS_PARAM_H

+# include <sys/param.h>

+#endif

+

+#if defined(__FreeBSD_kernel__)

+# include <pty.h>

+# ifdef HAVE_UTMP_H

+#  include <utmp.h>

+# endif

+# ifdef HAVE_LIBUTIL_H

+#  include <libutil.h>

+# endif

+#endif

 #ifdef __linux__

 #  include <sys/kd.h>

-#  include <sys/param.h>

 #  define USE_SYSLOG

 #  ifndef DEFAULT_VCTERM

 #    define DEFAULT_VCTERM "linux"

 #  endif

+#  if defined (__s390__) || defined (__s390x__)

+#    define DEFAULT_TTYS0  "dumb"

+#    define DEFAULT_TTY32  "ibm327x"

+#    define DEFAULT_TTYS1  "vt220"

+#  endif

 #  ifndef DEFAULT_STERM

 #    define DEFAULT_STERM  "vt102"

 #  endif

@@ -69,6 +95,10 @@

 #  endif

 #endif

+#ifdef __FreeBSD_kernel__

+#define USE_SYSLOG

+#endif

+

 /* If USE_SYSLOG is undefined all diagnostics go to /dev/console. */

 #ifdef	USE_SYSLOG

 #  include <syslog.h>

@@ -86,9 +116,9 @@

 /*

  * Things you may want to modify.

  *

- * If ISSUE is not defined, agetty will never display the contents of the

- * /etc/issue file. You will not want to spit out large "issue" files at the

- * wrong baud rate. Relevant for System V only.

+ * If ISSUE_SUPPORT is not defined, agetty will never display the contents of

+ * the /etc/issue file. You will not want to spit out large "issue" files at

+ * the wrong baud rate. Relevant for System V only.

  *

  * You may disagree with the default line-editing etc. characters defined

  * below. Note, however, that DEL cannot be used for interrupt generation

@@ -97,14 +127,26 @@

 /* Displayed before the login prompt. */

 #ifdef	SYSV_STYLE

-#  define ISSUE _PATH_ISSUE

-#  include <sys/utsname.h>

+#  define ISSUE_SUPPORT

 #endif

 /* Login prompt. */

 #define LOGIN		"login: "

 #define LOGIN_ARGV_MAX	16		/* Numbers of args for login */

+/*

+ * agetty --reload

+ */

+#ifdef AGETTY_RELOAD

+# include <sys/inotify.h>

+# include <linux/netlink.h>

+# include <linux/rtnetlink.h>

+# define AGETTY_RELOAD_FILENAME "/run/agetty.reload"	/* trigger file */

+# define AGETTY_RELOAD_FDNONE	-2			/* uninitialized fd */

+static int inotify_fd = AGETTY_RELOAD_FDNONE;

+static int netlink_fd = AGETTY_RELOAD_FDNONE;

+#endif

+

 /*

  * When multiple baud rates are specified on the command line, the first one

  * we will try is the first one specified.

@@ -116,7 +158,7 @@

 struct options {

 	int flags;			/* toggle switches, see below */

-	int timeout;			/* time-out period */

+	unsigned int timeout;			/* time-out period */

 	char *autolog;			/* login the user automatically */

 	char *chdir;			/* Chdir before the login */

 	char *chroot;			/* Chroot before the login */

@@ -126,11 +168,11 @@ struct options {

 	char *vcline;			/* line of virtual console */

 	char *term;			/* terminal type */

 	char *initstring;		/* modem init string */

-	char *issue;			/* alternative issue file */

+	char *issue;			/* alternative issue file or directory */

 	char *erasechars;		/* string with erase chars */

 	char *killchars;		/* string with kill chars */

 	char *osrelease;		/* /etc/os-release data */

-	int delay;			/* Sleep seconds before prompt */

+	unsigned int delay;			/* Sleep seconds before prompt */

 	int nice;			/* Run login with this priority */

 	int numspeed;			/* number of baud rates to try */

 	int clocal;			/* CLOCAL_MODE_* */

@@ -145,12 +187,12 @@ enum {

 };

 #define	F_PARSE		(1<<0)	/* process modem status messages */

-#define	F_ISSUE		(1<<1)	/* display /etc/issue */

+#define	F_ISSUE		(1<<1)	/* display /etc/issue or /etc/issue.d */

 #define	F_RTSCTS	(1<<2)	/* enable RTS/CTS flow control */

 #define F_INITSTRING    (1<<4)	/* initstring is set */

 #define F_WAITCRLF	(1<<5)	/* wait for CR or LF */

-#define F_CUSTISSUE	(1<<6)	/* give alternative issue file */

+

 #define F_NOPROMPT	(1<<7)	/* do not ask for login name! */

 #define F_LCUC		(1<<8)	/* support for *LCUC stty modes */

 #define F_KEEPSPEED	(1<<9)	/* follow baud rate from kernel */

@@ -189,16 +231,14 @@ static const struct Speedtab speedtab[] = {

 	{2400, B2400},

 	{4800, B4800},

 	{9600, B9600},

-#ifdef	B19200

+#ifdef B19200

 	{19200, B19200},

-#endif

-#ifdef	B38400

-	{38400, B38400},

-#endif

-#ifdef	EXTA

+#elif defined(EXTA)

 	{19200, EXTA},

 #endif

-#ifdef	EXTB

+#ifdef B38400

+	{38400, B38400},

+#elif defined(EXTB)

 	{38400, EXTB},

 #endif

 #ifdef B57600

@@ -209,6 +249,42 @@ static const struct Speedtab speedtab[] = {

 #endif

 #ifdef B230400

 	{230400, B230400},

+#endif

+#ifdef B460800

+	{460800, B460800},

+#endif

+#ifdef B500000

+	{500000, B500000},

+#endif

+#ifdef B576000

+	{576000, B576000},

+#endif

+#ifdef B921600

+	{921600, B921600},

+#endif

+#ifdef B1000000

+	{1000000, B1000000},

+#endif

+#ifdef B1152000

+	{1152000, B1152000},

+#endif

+#ifdef B1500000

+	{1500000, B1500000},

+#endif

+#ifdef B2000000

+	{2000000, B2000000},

+#endif

+#ifdef B2500000

+	{2500000, B2500000},

+#endif

+#ifdef B3000000

+	{3000000, B3000000},

+#endif

+#ifdef B3500000

+	{3500000, B3500000},

+#endif

+#ifdef B4000000

+	{4000000, B4000000},

 #endif

 	{0, 0},

 };

@@ -221,6 +297,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op);

 static void termio_init(struct options *op, struct termios *tp);

 static void reset_vc (const struct options *op, struct termios *tp);

 static void auto_baud(struct termios *tp);

+static void list_speeds(void);

 static void output_special_char (unsigned char c, struct options *op,

 		struct termios *tp, FILE *fp);

 static void do_prompt(struct options *op, struct termios *tp);

@@ -231,7 +308,8 @@ static void termio_final(struct options *op,

 			 struct termios *tp, struct chardata *cp);

 static int caps_lock(char *s);

 static speed_t bcode(char *s);

-static void usage(FILE * out) __attribute__((__noreturn__));

+static void usage(void) __attribute__((__noreturn__));

+static void exit_slowly(int code) __attribute__((__noreturn__));

 static void log_err(const char *, ...) __attribute__((__noreturn__))

 			       __attribute__((__format__(printf, 1, 2)));

 static void log_warn (const char *, ...)

@@ -239,13 +317,16 @@ static void log_warn (const char *, ...)

 static ssize_t append(char *dest, size_t len, const char  *sep, const char *src);

 static void check_username (const char* nm);

 static void login_options_to_argv(char *argv[], int *argc, char *str, char *username);

+static void reload_agettys(void);

+static void print_issue_file(struct options *op, struct termios *tp);

 /* Fake hostname for ut_host specified on command line. */

 static char *fakehost;

 #ifdef DEBUGGING

+# include "closestream.h"

 # ifndef DEBUG_OUTPUT

-#  define DEBUG_OUTPUT "/dev/ttyp0"

+#  define DEBUG_OUTPUT "/dev/tty10"

 # endif

 # define debug(s) do { fprintf(dbf,s); fflush(dbf); } while (0)

 FILE *dbf;

@@ -261,8 +342,7 @@ int main(int argc, char **argv)

 	struct options options = {

 		.flags  =  F_ISSUE,		/* show /etc/issue (SYSV_STYLE) */

 		.login  =  _PATH_LOGIN,		/* default login program */

-		.tty    = "tty1",		/* default tty line */

-		.issue  =  ISSUE		/* default issue file */

+		.tty    = "tty1"		/* default tty line */

 	};

 	char *login_argv[LOGIN_ARGV_MAX + 1];

 	int login_argc = 0;

@@ -283,8 +363,12 @@ int main(int argc, char **argv)

 #ifdef DEBUGGING

 	dbf = fopen(DEBUG_OUTPUT, "w");

-	for (int i = 1; i < argc; i++)

+	for (int i = 1; i < argc; i++) {

+		if (i > 1)

+			debug(" ");

 		debug(argv[i]);

+	}

+	debug("\n");

 #endif				/* DEBUGGING */

 	/* Parse command-line arguments. */

@@ -311,6 +395,13 @@ int main(int argc, char **argv)

 	sigaction(SIGHUP, &sa_hup, NULL);

 	tcsetpgrp(STDIN_FILENO, getpid());

+

+	/* Default is to follow the current line speed and then default to 9600 */

+	if ((options.flags & F_VCONSOLE) == 0 && options.numspeed == 0) {

+		options.speeds[options.numspeed++] = bcode("9600");

+		options.flags |= F_KEEPSPEED;

+	}

+

 	/* Initialize the termios settings (raw mode, eight-bit, blocking i/o). */

 	debug("calling termio_init\n");

 	termio_init(&options, &termios);

@@ -337,7 +428,7 @@ int main(int argc, char **argv)

 	/* Set the optional timer. */

 	if (options.timeout)

-		alarm((unsigned) options.timeout);

+		alarm(options.timeout);

 	/* Optionally wait for CR or LF before writing /etc/issue */

 	if (serial_tty_option(&options, F_WAITCRLF)) {

@@ -362,7 +453,9 @@ int main(int argc, char **argv)

 		username = options.autolog;

 	}

-	if ((options.flags & F_NOPROMPT) == 0) {

+	if (options.flags & F_NOPROMPT) {	/* --skip-login */

+		print_issue_file(&options, &termios);

+	} else {				/* regular (auto)login */

 		if (options.autolog) {

 			/* Autologin prompt */

 			do_prompt(&options, &termios);

@@ -372,7 +465,7 @@ int main(int argc, char **argv)

 			debug("reading login name\n");

 			while ((username =

 				get_logname(&options, &termios, &chardata)) == NULL)

-				if ((options.flags & F_VCONSOLE) == 0)

+				if ((options.flags & F_VCONSOLE) == 0 && options.numspeed)

 					next_speed(&options, &termios);

 		}

 	}

@@ -403,9 +496,12 @@ int main(int argc, char **argv)

 		login_options_to_argv(login_argv, &login_argc,

 				      options.logopt, username);

 	} else {

-		if (fakehost && (options.flags & F_REMOTE)) {

-			login_argv[login_argc++] = "-h";

-			login_argv[login_argc++] = fakehost;

+		if (options.flags & F_REMOTE) {

+			if (fakehost) {

+				login_argv[login_argc++] = "-h";

+				login_argv[login_argc++] = fakehost;

+			} else if (options.flags & F_NOHOSTNAME)

+				login_argv[login_argc++] = "-H";

 		}

 		if (username) {

 			if (options.autolog)

@@ -418,25 +514,18 @@ int main(int argc, char **argv)

 	login_argv[login_argc] = NULL;	/* last login argv */

-	if (options.chroot) {

-		if (chroot(options.chroot) < 0)

-			log_err(_("%s: can't change root directory %s: %m"),

-				options.tty, options.chroot);

-	}

-	if (options.chdir) {

-		if (chdir(options.chdir) < 0)

-			log_err(_("%s: can't change working directory %s: %m"),

-				options.tty, options.chdir);

-	}

-	if (options.nice) {

-		if (nice(options.nice) < 0)

-			log_warn(_("%s: can't change process priority: %m"),

-				options.tty);

-	}

-	if (options.osrelease)

-		free(options.osrelease);

+	if (options.chroot && chroot(options.chroot) < 0)

+		log_err(_("%s: can't change root directory %s: %m"),

+			options.tty, options.chroot);

+	if (options.chdir && chdir(options.chdir) < 0)

+		log_err(_("%s: can't change working directory %s: %m"),

+			options.tty, options.chdir);

+	if (options.nice && nice(options.nice) < 0)

+		log_warn(_("%s: can't change process priority: %m"),

+			 options.tty);

+

+	free(options.osrelease);

 #ifdef DEBUGGING

-	fprintf(dbf, "read %c\n", ch);

 	if (close_stream(dbf) != 0)

 		log_err("write failed: %s", DEBUG_OUTPUT);

 #endif

@@ -477,7 +566,7 @@ static char *replace_u(char *str, char *username)

 			log_err(_("failed to allocate memory: %m"));

 		if (p != str) {

-			/* copy chars befor \u */

+			/* copy chars before \u */

 			memcpy(tp, str, p - str);

 			tp += p - str;

 		}

@@ -527,6 +616,55 @@ static void login_options_to_argv(char *argv[], int *argc,

 	*argc = i;

 }

+static void output_version(void)

+{

+	static const char *features[] = {

+#ifdef DEBUGGING

+		"debug",

+#endif

+#ifdef CRTSCTS

+		"flow control",

+#endif

+#ifdef KDGKBLED

+		"hints",

+#endif

+#ifdef ISSUE_SUPPORT

+		"issue",

+#endif

+#ifdef ISSUEDIR_SUPPORT

+		"issue.d",

+#endif

+#ifdef KDGKBMODE

+		"keyboard mode",

+#endif

+#ifdef USE_PLYMOUTH_SUPPORT

+		"plymouth",

+#endif

+#ifdef AGETTY_RELOAD

+		"reload",

+#endif

+#ifdef USE_SYSLOG

+		"syslog",

+#endif

+#ifdef HAVE_WIDECHAR

+		"widechar",

+#endif

+		NULL

+	};

+	unsigned int i;

+

+	printf( _("%s from %s"), program_invocation_short_name, PACKAGE_STRING);

+	fputs(" (", stdout);

+	for (i = 0; features[i]; i++) {

+		if (0 < i)

+			fputs(", ", stdout);

+		printf("%s", features[i]);

+	}

+	fputs(")\n", stdout);

+}

+

+#define is_speed(str) (strlen((str)) == strspn((str), "0123456789,"))

+

 /* Parse command-line arguments. */

 static void parse_args(int argc, char **argv, struct options *op)

 {

@@ -540,46 +678,50 @@ static void parse_args(int argc, char **argv, struct options *op)

 		HELP_OPTION,

 		ERASE_CHARS_OPTION,

 		KILL_CHARS_OPTION,

+		RELOAD_OPTION,

+		LIST_SPEEDS_OPTION,

 	};

 	const struct option longopts[] = {

-		{  "8bits",	     no_argument,	 0,  '8'  },

-		{  "autologin",	     required_argument,	 0,  'a'  },

-		{  "noreset",	     no_argument,	 0,  'c'  },

-		{  "chdir",	     required_argument,	 0,  'C'  },

-		{  "delay",	     required_argument,	 0,  'd'  },

-		{  "remote",         no_argument,        0,  'E'  },

-		{  "issue-file",     required_argument,  0,  'f'  },

-		{  "flow-control",   no_argument,	 0,  'h'  },

-		{  "host",	     required_argument,  0,  'H'  },

-		{  "noissue",	     no_argument,	 0,  'i'  },

-		{  "init-string",    required_argument,  0,  'I'  },

-		{  "noclear",	     no_argument,	 0,  'J'  },

-		{  "login-program",  required_argument,  0,  'l'  },

-		{  "local-line",     optional_argument,	 0,  'L'  },

-		{  "extract-baud",   no_argument,	 0,  'm'  },

-		{  "skip-login",     no_argument,	 0,  'n'  },

-		{  "nonewline",	     no_argument,	 0,  'N'  },

-		{  "login-options",  required_argument,  0,  'o'  },

-		{  "login-pause",    no_argument,        0,  'p'  },

-		{  "nice",	     required_argument,  0,  'P'  },

-		{  "chroot",	     required_argument,	 0,  'r'  },

-		{  "hangup",	     no_argument,	 0,  'R'  },

-		{  "keep-baud",      no_argument,	 0,  's'  },

-		{  "timeout",	     required_argument,  0,  't'  },

-		{  "detect-case",    no_argument,	 0,  'U'  },

-		{  "wait-cr",	     no_argument,	 0,  'w'  },

-		{  "nohints",        no_argument,        0,  NOHINTS_OPTION },

-		{  "nohostname",     no_argument,	 0,  NOHOSTNAME_OPTION },

-		{  "long-hostname",  no_argument,	 0,  LONGHOSTNAME_OPTION },

-		{  "version",	     no_argument,	 0,  VERSION_OPTION  },

-		{  "help",	     no_argument,	 0,  HELP_OPTION     },

-		{  "erase-chars",    required_argument,  0,  ERASE_CHARS_OPTION },

-		{  "kill-chars",     required_argument,  0,  KILL_CHARS_OPTION },

-		{ NULL, 0, 0, 0 }

+		{  "8bits",	     no_argument,	 NULL,  '8'  },

+		{  "autologin",	     required_argument,	 NULL,  'a'  },

+		{  "noreset",	     no_argument,	 NULL,  'c'  },

+		{  "chdir",	     required_argument,	 NULL,  'C'  },

+		{  "delay",	     required_argument,	 NULL,  'd'  },

+		{  "remote",         no_argument,        NULL,  'E'  },

+		{  "issue-file",     required_argument,  NULL,  'f'  },

+		{  "flow-control",   no_argument,	 NULL,  'h'  },

+		{  "host",	     required_argument,  NULL,  'H'  },

+		{  "noissue",	     no_argument,	 NULL,  'i'  },

+		{  "init-string",    required_argument,  NULL,  'I'  },

+		{  "noclear",	     no_argument,	 NULL,  'J'  },

+		{  "login-program",  required_argument,  NULL,  'l'  },

+		{  "local-line",     optional_argument,	 NULL,  'L'  },

+		{  "extract-baud",   no_argument,	 NULL,  'm'  },

+		{  "list-speeds",    no_argument,	 NULL,	LIST_SPEEDS_OPTION },

+		{  "skip-login",     no_argument,	 NULL,  'n'  },

+		{  "nonewline",	     no_argument,	 NULL,  'N'  },

+		{  "login-options",  required_argument,  NULL,  'o'  },

+		{  "login-pause",    no_argument,        NULL,  'p'  },

+		{  "nice",	     required_argument,  NULL,  'P'  },

+		{  "chroot",	     required_argument,	 NULL,  'r'  },

+		{  "hangup",	     no_argument,	 NULL,  'R'  },

+		{  "keep-baud",      no_argument,	 NULL,  's'  },

+		{  "timeout",	     required_argument,  NULL,  't'  },

+		{  "detect-case",    no_argument,	 NULL,  'U'  },

+		{  "wait-cr",	     no_argument,	 NULL,  'w'  },

+		{  "nohints",        no_argument,        NULL,  NOHINTS_OPTION },

+		{  "nohostname",     no_argument,	 NULL,  NOHOSTNAME_OPTION },

+		{  "long-hostname",  no_argument,	 NULL,  LONGHOSTNAME_OPTION },

+		{  "reload",         no_argument,        NULL,  RELOAD_OPTION },

+		{  "version",	     no_argument,	 NULL,  VERSION_OPTION  },

+		{  "help",	     no_argument,	 NULL,  HELP_OPTION     },

+		{  "erase-chars",    required_argument,  NULL,  ERASE_CHARS_OPTION },

+		{  "kill-chars",     required_argument,  NULL,  KILL_CHARS_OPTION },

+		{ NULL, 0, NULL, 0 }

 	};

 	while ((c = getopt_long(argc, argv,

-			   "8a:cC:d:Ef:hH:iI:Jl:LmnNo:pP:r:Rst:Uw", longopts,

+			   "8a:cC:d:Ef:hH:iI:Jl:L::mnNo:pP:r:Rst:Uw", longopts,

 			    NULL)) != -1) {

 		switch (c) {

 		case '8':

@@ -595,13 +737,12 @@ static void parse_args(int argc, char **argv, struct options *op)

 			op->chdir = optarg;

 			break;

 		case 'd':

-			op->delay = atoi(optarg);

+			op->delay = strtou32_or_err(optarg,  _("invalid delay argument"));

 			break;

 		case 'E':

 			op->flags |= F_REMOTE;

 			break;

 		case 'f':

-			op->flags |= F_CUSTISSUE;

 			op->issue = optarg;

 			break;

 		case 'h':

@@ -634,7 +775,7 @@ static void parse_args(int argc, char **argv, struct options *op)

 				else if (strcmp(optarg, "=auto") == 0)

 					op->clocal = CLOCAL_MODE_AUTO;

 				else

-					log_err(_("unssuported --local-line mode argument"));

+					log_err(_("invalid argument of --local-line"));

 			}

 			break;

 		case 'm':

@@ -643,6 +784,9 @@ static void parse_args(int argc, char **argv, struct options *op)

 		case 'n':

 			op->flags |= F_NOPROMPT;

 			break;

+		case 'N':

+			op->flags |= F_NONL;

+			break;

 		case 'o':

 			op->logopt = optarg;

 			break;

@@ -650,7 +794,7 @@ static void parse_args(int argc, char **argv, struct options *op)

 			op->flags |= F_LOGINPAUSE;

 			break;

 		case 'P':

-			op->nice = atoi(optarg);

+			op->nice = strtos32_or_err(optarg,  _("invalid nice argument"));

 			break;

 		case 'r':

 			op->chroot = optarg;

@@ -662,8 +806,7 @@ static void parse_args(int argc, char **argv, struct options *op)

 			op->flags |= F_KEEPSPEED;

 			break;

 		case 't':

-			if ((op->timeout = atoi(optarg)) <= 0)

-				log_err(_("bad timeout value: %s"), optarg);

+			op->timeout = strtou32_or_err(optarg,  _("invalid timeout argument"));

 			break;

 		case 'U':

 			op->flags |= F_LCUC;

@@ -686,14 +829,19 @@ static void parse_args(int argc, char **argv, struct options *op)

 		case KILL_CHARS_OPTION:

 			op->killchars = optarg;

 			break;

+		case RELOAD_OPTION:

+			reload_agettys();

+			exit(EXIT_SUCCESS);

+		case LIST_SPEEDS_OPTION:

+			list_speeds();

+			exit(EXIT_SUCCESS);

 		case VERSION_OPTION:

-			printf(_("%s from %s\n"), program_invocation_short_name,

-			       PACKAGE_STRING);

+			output_version();

 			exit(EXIT_SUCCESS);

 		case HELP_OPTION:

-			usage(stdout);

+			usage();

 		default:

-			usage(stderr);

+			errtryhelp(EXIT_FAILURE);

 		}

 	}

@@ -701,26 +849,26 @@ static void parse_args(int argc, char **argv, struct options *op)

 	if (argc < optind + 1) {

 		log_warn(_("not enough arguments"));

-		usage(stderr);

+		errx(EXIT_FAILURE, _("not enough arguments"));

 	}

 	/* Accept "tty", "baudrate tty", and "tty baudrate". */

-	if ('0' <= argv[optind][0] && argv[optind][0] <= '9') {

+	if (is_speed(argv[optind])) {

 		/* Assume BSD style speed. */

 		parse_speeds(op, argv[optind++]);

 		if (argc < optind + 1) {

-			warn(_("not enough arguments"));

-			usage(stderr);

+			log_warn(_("not enough arguments"));

+			errx(EXIT_FAILURE, _("not enough arguments"));

 		}

 		op->tty = argv[optind++];

 	} else {

 		op->tty = argv[optind++];

 		if (argc > optind) {

-			char *v = argv[optind++];

-			if ('0' <= *v && *v <= '9')

+			char *v = argv[optind];

+			if (is_speed(v)) {

 				parse_speeds(op, v);

-			else

-				op->speeds[op->numspeed++] = bcode("9600");

+				optind++;

+			}

 		}

 	}

@@ -732,45 +880,6 @@ static void parse_args(int argc, char **argv, struct options *op)

 	if (argc > optind && argv[optind])

 		op->term = argv[optind];

-#ifdef DO_DEVFS_FIDDLING

-	/*

-	 * Some devfs junk, following Goswin Brederlow:

-	 *   turn ttyS<n> into tts/<n>

-	 *   turn tty<n> into vc/<n>

-	 * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=72241

-	 */

-	if (op->tty && strlen(op->tty) < 90) {

-		char dev_name[100];

-		struct stat st;

-

-		if (strncmp(op->tty, "ttyS", 4) == 0) {

-			strcpy(dev_name, "/dev/");

-			strcat(dev_name, op->tty);

-			if (stat(dev_name, &st) < 0) {

-				strcpy(dev_name, "/dev/tts/");

-				strcat(dev_name, op->tty + 4);

-				if (stat(dev_name, &st) == 0) {

-					op->tty = strdup(dev_name + 5);

-					if (!op->tty)

-						log_err(_("failed to allocate memory: %m"));

-				}

-			}

-		} else if (strncmp(op->tty, "tty", 3) == 0) {

-			strcpy(dev_name, "/dev/");

-			strncat(dev_name, op->tty, 90);

-			if (stat(dev_name, &st) < 0) {

-				strcpy(dev_name, "/dev/vc/");

-				strcat(dev_name, op->tty + 3);

-				if (stat(dev_name, &st) == 0) {