diff options
| author | Karel Zak | 2011-10-03 17:06:08 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-10-26 23:17:17 +0200 |
| commit | a2e84c7dbe1b6a4263d40ba3435fa1371f53c018 (patch) | |
| tree | 2d341d744e8dc160d3318fe57438fc41cac38d06 /login-utils | |
| parent | login: env initialization refactoring (diff) | |
| download | kernel-qcow2-util-linux-a2e84c7dbe1b6a4263d40ba3435fa1371f53c018.tar.gz kernel-qcow2-util-linux-a2e84c7dbe1b6a4263d40ba3435fa1371f53c018.tar.xz kernel-qcow2-util-linux-a2e84c7dbe1b6a4263d40ba3435fa1371f53c018.zip | |
login: use xalloc.h
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'login-utils')
| -rw-r--r-- | login-utils/login.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/login-utils/login.c b/login-utils/login.c index 41ff3912b..f77a2f986 100644 --- a/login-utils/login.c +++ b/login-utils/login.c @@ -515,7 +515,6 @@ static struct passwd *get_passwd_entry(const char *username, { struct passwd *res = NULL; size_t sz; - char *tmp; int x; if (!pwdbuf || !username) @@ -527,13 +526,7 @@ static struct passwd *get_passwd_entry(const char *username, #endif sz = 16384; - tmp = realloc(*pwdbuf, sz); - if (!tmp) { - free(*pwdbuf); - *pwdbuf = NULL; - return NULL; - } - *pwdbuf = tmp; + *pwdbuf = xrealloc(*pwdbuf, sz); x = getpwnam_r(username, pwd, *pwdbuf, sz, &res); if (!res) { @@ -933,11 +926,11 @@ static void init_environ(struct login_context *cxt) int len, i; termenv = getenv("TERM"); - termenv = termenv ? strdup(termenv) : "dumb"; + termenv = termenv ? xstrdup(termenv) : "dumb"; /* destroy environment unless user has requested preservation (-p) */ if (!cxt->keep_env) { - environ = (char **) malloc(sizeof(char *)); + environ = (char **) xmalloc(sizeof(char *)); memset(environ, 0, sizeof(char *)); } @@ -1022,7 +1015,7 @@ int main(int argc, char **argv) strcasecmp(p, domain) == 0) *p = 0; - cxt.hostname = strdup(optarg); + cxt.hostname = xstrdup(optarg); { struct addrinfo hints, *info = NULL; @@ -1067,7 +1060,7 @@ int main(int argc, char **argv) if (*argv) { char *p = *argv; - cxt.username = strdup(p); + cxt.username = xstrdup(p); /* wipe name - some people mistype their password here */ /* (of course we are too late, but perhaps this helps a little ..) */ |