rosh: fix errors in previous commit

diff --git a/com32/rosh/rosh.c b/com32/rosh/rosh.c
index 0d51f22..aac6044 100644 (file)
--- 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 907df1e..6e312ed 100644 (file)
--- 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 */