aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGene Cumm <gene.cumm@gmail.com>2010-09-30 23:08:24 -0400
committerGene Cumm <gene.cumm@gmail.com>2010-10-09 07:33:07 -0400
commit81dc3bbd5faf59405bee1398239d14b30f92cca6 (patch)
tree2638dab1c54a19ca91e66d30145cddf2654723b7
parent2e16477b7971de5459fa82d6739d7008911717c8 (diff)
downloadsyslinux-81dc3bbd5faf59405bee1398239d14b30f92cca6.tar.gz
syslinux-81dc3bbd5faf59405bee1398239d14b30f92cca6.tar.xz
syslinux-81dc3bbd5faf59405bee1398239d14b30f92cca6.zip
rosh: fix errors in previous commit
-rw-r--r--com32/rosh/rosh.c5
-rw-r--r--com32/rosh/rosh.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/com32/rosh/rosh.c b/com32/rosh/rosh.c
index 0d51f220..aac60441 100644
--- a/com32/rosh/rosh.c
+++ b/com32/rosh/rosh.c
@@ -426,7 +426,10 @@ void rosh_cd(int argc, char *argv[], const char *ipwdstr)
else
rosh_help(2, argv[0]);
if (rv != 0) {
- rosh_error(errno, "cd", filestr);
+ if (argc == 2)
+ rosh_error(errno, "cd", argv[1]);
+ else
+ rosh_error(errno, "cd", ipwdstr);
errno = 0;
} else {
#ifdef DO_DEBUG
diff --git a/com32/rosh/rosh.h b/com32/rosh/rosh.h
index 907df1ea..6e312ede 100644
--- a/com32/rosh/rosh.h
+++ b/com32/rosh/rosh.h
@@ -56,7 +56,7 @@
# endif /* DO_DEBUG2 */
#else /* DO_DEBUG */
# define ROSH_DEBUG(f, ...) ((void)0)
-# define ROSH_DEBUG_ARGV(int argc, char *argv[]) ((void)0)
+# define ROSH_DEBUG_ARGV(argc, argv) ((void)0)
# define ROSH_DEBUG2(f, ...) ((void)0)
#endif /* DO_DEBUG */