diff options
| author | Daniel Mierswa | 2009-08-17 07:27:39 +0200 |
|---|---|---|
| committer | Karel Zak | 2009-08-17 11:15:59 +0200 |
| commit | c0f19ccff73aa0ec5e9f3b61b932ea4a8bf4e6ed (patch) | |
| tree | 6d4671545542031f67face36783f8ad64b29057c /login-utils/login.c | |
| parent | libblkid: fix cache->probe memory leak (diff) | |
| download | kernel-qcow2-util-linux-c0f19ccff73aa0ec5e9f3b61b932ea4a8bf4e6ed.tar.gz kernel-qcow2-util-linux-c0f19ccff73aa0ec5e9f3b61b932ea4a8bf4e6ed.tar.xz kernel-qcow2-util-linux-c0f19ccff73aa0ec5e9f3b61b932ea4a8bf4e6ed.zip | |
replace bcopy,bzero,index and rindex
Those 4 functions are marked as LEGACY in POSIX.1-2001 and removed in
POSIX.1-2008.
Replaced with memmove,memset,strchr and strrchr.
Signed-off-by: Daniel Mierswa <impulze@impulze.org>
Diffstat (limited to 'login-utils/login.c')
| -rw-r--r-- | login-utils/login.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/login-utils/login.c b/login-utils/login.c index 7328edeb9..486b30bf0 100644 --- a/login-utils/login.c +++ b/login-utils/login.c @@ -418,7 +418,7 @@ main(int argc, char **argv) */ gethostname(tbuf, sizeof(tbuf)); xstrncpy(thishost, tbuf, sizeof(thishost)); - domain = index(tbuf, '.'); + domain = strchr(tbuf, '.'); username = tty_name = hostname = NULL; fflag = hflag = pflag = 0; @@ -437,7 +437,7 @@ main(int argc, char **argv) exit(1); } hflag = 1; - if (domain && (p = index(optarg, '.')) && + if (domain && (p = strchr(optarg, '.')) && strcasecmp(p, domain) == 0) *p = 0; @@ -1251,7 +1251,7 @@ Michael Riepe <michael@stud.uni-hannover.de> childArgv[childArgc++] = buff; } else { tbuf[0] = '-'; - xstrncpy(tbuf + 1, ((p = rindex(pwd->pw_shell, '/')) ? + xstrncpy(tbuf + 1, ((p = strrchr(pwd->pw_shell, '/')) ? p + 1 : pwd->pw_shell), sizeof(tbuf)-1); |