syslogd: fix "readpath bug" by using readlink instead
libbb: rename xgetcwd and xreadlink
This commit is contained in:
@@ -423,8 +423,8 @@ static const struct built_in_command bltins[] = {
|
||||
static const char *set_cwd(void)
|
||||
{
|
||||
if (cwd == bb_msg_unknown)
|
||||
cwd = NULL; /* xgetcwd(arg) called free(arg) */
|
||||
cwd = xgetcwd((char *)cwd);
|
||||
cwd = NULL; /* xrealloc_getcwd_or_warn(arg) called free(arg) */
|
||||
cwd = xrealloc_getcwd_or_warn((char *)cwd);
|
||||
if (!cwd)
|
||||
cwd = bb_msg_unknown;
|
||||
return cwd;
|
||||
|
@@ -217,7 +217,7 @@ static int builtin_cd(struct child_prog *child)
|
||||
bb_perror_msg("cd: %s", newdir);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
cwd = xgetcwd((char *)cwd);
|
||||
cwd = xrealloc_getcwd_or_warn((char *)cwd);
|
||||
if (!cwd)
|
||||
cwd = bb_msg_unknown;
|
||||
return EXIT_SUCCESS;
|
||||
@@ -342,7 +342,7 @@ static int builtin_jobs(struct child_prog *child)
|
||||
/* built-in 'pwd' handler */
|
||||
static int builtin_pwd(struct child_prog ATTRIBUTE_UNUSED *dummy)
|
||||
{
|
||||
cwd = xgetcwd((char *)cwd);
|
||||
cwd = xrealloc_getcwd_or_warn((char *)cwd);
|
||||
if (!cwd)
|
||||
cwd = bb_msg_unknown;
|
||||
puts(cwd);
|
||||
@@ -1569,7 +1569,7 @@ int lash_main(int argc_l, char **argv_l)
|
||||
}
|
||||
|
||||
/* initialize the cwd -- this is never freed...*/
|
||||
cwd = xgetcwd(0);
|
||||
cwd = xrealloc_getcwd_or_warn(NULL);
|
||||
if (!cwd)
|
||||
cwd = bb_msg_unknown;
|
||||
|
||||
|
Reference in New Issue
Block a user