Changeset 486f8b84 in rtems

Timestamp:

May 29, 2012, 2:19:38 PM (9 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Children:

e308b3a7

Parents:

246e23c (diff), f7f2eb5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'upstream'

Location:

cpukit

Files:

• ftpd/ftpd.c (modified) (2 diffs)
• libfs/src/dosfs/msdos_format.c (modified) (2 diffs)

cpukit/ftpd/ftpd.c

@@ -1891 +1891 @@
 
     chroot_made = chroot_made || chroot(ftpd_root) == 0;
-    chdir("/");
 
     errno = 0;
@@ -1927 +1926 @@
     free(info->pass);
     task_pool_release(info);
+
+    chdir("/");
   }
 }

cpukit/libfs/src/dosfs/msdos_format.c

@@ -34 +34 @@
 #include <stdio.h>
 #include <ctype.h>
+#include <inttypes.h>
 
 #include <rtems/libio_.h>
@@ -401 +402 @@
     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);
   }