Changeset 486f8b84 in rtems


Ignore:
Timestamp:
May 29, 2012, 2:19:38 PM (8 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:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ftpd/ftpd.c

    r246e23c r486f8b84  
    18911891
    18921892    chroot_made = chroot_made || chroot(ftpd_root) == 0;
    1893     chdir("/");
    18941893
    18951894    errno = 0;
     
    19271926    free(info->pass);
    19281927    task_pool_release(info);
     1928
     1929    chdir("/");
    19291930  }
    19301931}
  • cpukit/libfs/src/dosfs/msdos_format.c

    r246e23c r486f8b84  
    3434#include <stdio.h>
    3535#include <ctype.h>
     36#include <inttypes.h>
    3637
    3738#include <rtems/libio_.h>
     
    401402    total_size = fmt_params->bytes_per_sector * fmt_params->totl_sector_cnt;
    402403    msdos_format_printf (rqdata, MSDOS_FMT_INFO_LEVEL_DETAIL,
    403                          "bytes per sector: %d\ntotal sectors: %d\ntotal size: %lu\n",
     404                         "bytes per sector: %" PRIu32 "\ntotal sectors: %" PRIu32 "\ntotal size: %" PRIu64 "\n",
    404405                         fmt_params->bytes_per_sector, fmt_params->totl_sector_cnt, total_size);
    405406  }
Note: See TracChangeset for help on using the changeset viewer.