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 | |
| 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')
| -rw-r--r-- | login-utils/login.c | 6 | ||||
| -rw-r--r-- | login-utils/shutdown.c | 2 | ||||
| -rw-r--r-- | login-utils/ttymsg.c | 2 | ||||
| -rw-r--r-- | login-utils/vipw.c | 4 | ||||
| -rw-r--r-- | login-utils/wall.c | 2 |
5 files changed, 8 insertions, 8 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); diff --git a/login-utils/shutdown.c b/login-utils/shutdown.c index f798e5812..58600b9d8 100644 --- a/login-utils/shutdown.c +++ b/login-utils/shutdown.c @@ -281,7 +281,7 @@ main(int argc, char *argv[]) if (fgets (line, sizeof(line), fp) != NULL && strncasecmp (line, "HALT_ACTION", 11) == 0 && iswhitespace(line[11])) { - p = index(line, '\n'); + p = strchr(line, '\n'); if (p) *p = 0; /* strip final '\n' */ p = line+11; diff --git a/login-utils/ttymsg.c b/login-utils/ttymsg.c index 24b74bcbc..92282c127 100644 --- a/login-utils/ttymsg.c +++ b/login-utils/ttymsg.c @@ -111,7 +111,7 @@ ttymsg(struct iovec *iov, int iovcnt, char *line, int tmout) { if (wret >= 0) { left -= wret; if (iov != localiov) { - bcopy(iov, localiov, + memmove(localiov, iov, iovcnt * sizeof(struct iovec)); iov = localiov; } diff --git a/login-utils/vipw.c b/login-utils/vipw.c index 5f4472111..b3972f3b3 100644 --- a/login-utils/vipw.c +++ b/login-utils/vipw.c @@ -311,8 +311,8 @@ int main(int argc, char *argv[]) { bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - bzero(tmp_file, FILENAMELEN); - progname = (rindex(argv[0], '/')) ? rindex(argv[0], '/') + 1 : argv[0]; + memset(tmp_file, '\0', FILENAMELEN); + progname = (strrchr(argv[0], '/')) ? strrchr(argv[0], '/') + 1 : argv[0]; if (!strcmp(progname, "vigr")) { program = VIGR; xstrncpy(orig_file, GROUP_FILE, sizeof(orig_file)); diff --git a/login-utils/wall.c b/login-utils/wall.c index 42856ae38..7b5f6718f 100644 --- a/login-utils/wall.c +++ b/login-utils/wall.c @@ -95,7 +95,7 @@ main(int argc, char **argv) { textdomain(PACKAGE); progname = argv[0]; - p = rindex(progname, '/'); + p = strrchr(progname, '/'); if (p) progname = p+1; |