aboutsummaryrefslogtreecommitdiff
path: root/shell/lash.c
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-02-11 16:19:28 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-02-11 16:19:28 +0000
commit661a976a4fe1564096942a548031bcc1a4915057 (patch)
treec13da1537be3327e041fac86d9fdce68de70298a /shell/lash.c
parent5614b1d6f3e1a5c137f431999fbbb38ce8cb8db8 (diff)
downloadbusybox-w32-661a976a4fe1564096942a548031bcc1a4915057.tar.gz
busybox-w32-661a976a4fe1564096942a548031bcc1a4915057.tar.bz2
busybox-w32-661a976a4fe1564096942a548031bcc1a4915057.zip
syslogd: fix "readpath bug" by using readlink instead
libbb: rename xgetcwd and xreadlink git-svn-id: svn://busybox.net/trunk/busybox@17854 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'shell/lash.c')
-rw-r--r--shell/lash.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/lash.c b/shell/lash.c
index 502e0d829..09067fda0 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -217,7 +217,7 @@ static int builtin_cd(struct child_prog *child)
217 bb_perror_msg("cd: %s", newdir); 217 bb_perror_msg("cd: %s", newdir);
218 return EXIT_FAILURE; 218 return EXIT_FAILURE;
219 } 219 }
220 cwd = xgetcwd((char *)cwd); 220 cwd = xrealloc_getcwd_or_warn((char *)cwd);
221 if (!cwd) 221 if (!cwd)
222 cwd = bb_msg_unknown; 222 cwd = bb_msg_unknown;
223 return EXIT_SUCCESS; 223 return EXIT_SUCCESS;
@@ -342,7 +342,7 @@ static int builtin_jobs(struct child_prog *child)
342/* built-in 'pwd' handler */ 342/* built-in 'pwd' handler */
343static int builtin_pwd(struct child_prog ATTRIBUTE_UNUSED *dummy) 343static int builtin_pwd(struct child_prog ATTRIBUTE_UNUSED *dummy)
344{ 344{
345 cwd = xgetcwd((char *)cwd); 345 cwd = xrealloc_getcwd_or_warn((char *)cwd);
346 if (!cwd) 346 if (!cwd)
347 cwd = bb_msg_unknown; 347 cwd = bb_msg_unknown;
348 puts(cwd); 348 puts(cwd);
@@ -1569,7 +1569,7 @@ int lash_main(int argc_l, char **argv_l)
1569 } 1569 }
1570 1570
1571 /* initialize the cwd -- this is never freed...*/ 1571 /* initialize the cwd -- this is never freed...*/
1572 cwd = xgetcwd(0); 1572 cwd = xrealloc_getcwd_or_warn(NULL);
1573 if (!cwd) 1573 if (!cwd)
1574 cwd = bb_msg_unknown; 1574 cwd = bb_msg_unknown;
1575 1575