Merge branch 'upstream'

2 files changed, 4 insertions, 2 deletions

diff --git a/cpukit/ftpd/ftpd.c b/cpukit/ftpd/ftpd.c
index 2668c295eb..905f40c2d8 100644
--- a/cpukit/ftpd/ftpd.c
+++ b/cpukit/ftpd/ftpd.c
@@ -1890,7 +1890,6 @@ session(rtems_task_argument arg)
       &set);
 
     chroot_made = chroot_made || chroot(ftpd_root) == 0;
-    chdir("/");
 
     errno = 0;
 
@@ -1926,6 +1925,8 @@ session(rtems_task_argument arg)
     free(info->user);
     free(info->pass);
     task_pool_release(info);
+
+    chdir("/");
   }
 }
 
diff --git a/cpukit/libfs/src/dosfs/msdos_format.c b/cpukit/libfs/src/dosfs/msdos_format.c
index 2a9d09048f..9af86b7d62 100644
--- a/cpukit/libfs/src/dosfs/msdos_format.c
+++ b/cpukit/libfs/src/dosfs/msdos_format.c
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <inttypes.h>
 
 #include <rtems/libio_.h>
 
@@ -400,7 +401,7 @@ static int msdos_format_determine_fmt_params
   if (ret_val == 0) {
     total_size = fmt_params->bytes_per_sector * fmt_params->totl_sector_cnt;
     msdos_format_printf (rqdata, MSDOS_FMT_INFO_LEVEL_DETAIL,
-                         "bytes per sector: %d\ntotal sectors: %d\ntotal size: %lu\n",
+                         "bytes per sector: %" PRIu32 "\ntotal sectors: %" PRIu32 "\ntotal size: %" PRIu64 "\n",
                          fmt_params->bytes_per_sector, fmt_params->totl_sector_cnt, total_size);
   }