diff options
| author | Sami Kerola | 2011-04-10 12:16:08 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-04-14 13:08:59 +0200 |
| commit | be66a93afcef1da6a6b36a10dabcfef50aa63903 (patch) | |
| tree | 854e3d1e4c69ff641e86ab2faed2157f155e7239 /term-utils/agetty.c | |
| parent | libmount: use libmnt_lock for utab flock (diff) | |
| download | kernel-qcow2-util-linux-be66a93afcef1da6a6b36a10dabcfef50aa63903.tar.gz kernel-qcow2-util-linux-be66a93afcef1da6a6b36a10dabcfef50aa63903.tar.xz kernel-qcow2-util-linux-be66a93afcef1da6a6b36a10dabcfef50aa63903.zip | |
agetty: use xalloc.h
Unifies and fixes malloc and strdup calls.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'term-utils/agetty.c')
| -rw-r--r-- | term-utils/agetty.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/term-utils/agetty.c b/term-utils/agetty.c index 57d198039..0609bc5d7 100644 --- a/term-utils/agetty.c +++ b/term-utils/agetty.c @@ -36,6 +36,7 @@ #include "nls.h" #include "pathnames.h" #include "c.h" +#include "xalloc.h" #ifdef __linux__ #include <sys/param.h> @@ -384,10 +385,7 @@ parse_args(argc, argv, op) op->eightbits = 1; break; case 'I': - if (!(op->initstring = malloc(strlen(optarg)+1))) { - error(_("can't malloc initstring")); - break; - } + op->initstring = xmalloc(strlen(optarg) + 1); { char ch, *p, *q; int i; @@ -500,7 +498,7 @@ parse_args(argc, argv, op) strcpy(dev_name, "/dev/tts/"); strcat(dev_name, op->tty + 4); if (stat(dev_name, &st) == 0) - op->tty = strdup(dev_name + 5); + op->tty = xstrdup(dev_name + 5); } } else if (strncmp(op->tty, "tty", 3) == 0) { strcpy(dev_name, "/dev/"); @@ -509,7 +507,7 @@ parse_args(argc, argv, op) strcpy(dev_name, "/dev/vc/"); strcat(dev_name, op->tty + 3); if (stat(dev_name, &st) == 0) - op->tty = strdup(dev_name + 5); + op->tty = xstrdup(dev_name + 5); } } } |