2010-02-18 Chris Johns <chrisj@rtems.org>

* libfs/src/rfs/rtems-rfs-bitmaps.c,
        libfs/src/rfs/rtems-rfs-bitmaps.h,
        libfs/src/rfs/rtems-rfs-bitmaps-ut.c,
        libfs/src/rfs/rtems-rfs-block.c, libfs/src/rfs/rtems-rfs-block.h,
        libfs/src/rfs/rtems-rfs-block-pos.h,
        libfs/src/rfs/rtems-rfs-buffer-bdbuf.c,
        libfs/src/rfs/rtems-rfs-buffer.c,
        libfs/src/rfs/rtems-rfs-buffer-devio.c,
        libfs/src/rfs/rtems-rfs-buffer.h, libfs/src/rfs/rtems-rfs-data.h,
        libfs/src/rfs/rtems-rfs-dir.c, libfs/src/rfs/rtems-rfs-dir.h,
        libfs/src/rfs/rtems-rfs-dir-hash.c,
        libfs/src/rfs/rtems-rfs-dir-hash.h,
        libfs/src/rfs/rtems-rfs-file.c, libfs/src/rfs/rtems-rfs-file.h,
        libfs/src/rfs/rtems-rfs-file-system.c,
        libfs/src/rfs/rtems-rfs-file-system-fwd.h,
        libfs/src/rfs/rtems-rfs-file-system.h,
        libfs/src/rfs/rtems-rfs-format.c,
        libfs/src/rfs/rtems-rfs-format.h, libfs/src/rfs/rtems-rfs-group.c,
        libfs/src/rfs/rtems-rfs-group.h, libfs/src/rfs/rtems-rfs.h,
        libfs/src/rfs/rtems-rfs-inode.c, libfs/src/rfs/rtems-rfs-inode.h,
        libfs/src/rfs/rtems-rfs-link.c, libfs/src/rfs/rtems-rfs-link.h,
        libfs/src/rfs/rtems-rfs-mutex.c, libfs/src/rfs/rtems-rfs-mutex.h,
        libfs/src/rfs/rtems-rfs-rtems.c,
        libfs/src/rfs/rtems-rfs-rtems-dev.c,
        libfs/src/rfs/rtems-rfs-rtems-dir.c,
        libfs/src/rfs/rtems-rfs-rtems-file.c,
        libfs/src/rfs/rtems-rfs-rtems.h,
        libfs/src/rfs/rtems-rfs-rtems-utils.c,
        libfs/src/rfs/rtems-rfs-shell.c, libfs/src/rfs/rtems-rfs-shell.h,
        libfs/src/rfs/rtems-rfs-trace.c, libfs/src/rfs/rtems-rfs-trace.h:
        New.

        * Makefile.am, preinstall.am, libfs/Makefile.am,
        wrapup/Makefile.am: Updated with the RFS support.

        * libfs/README: Updated after 10 years.

        * libblock/src/flashdisk.c, libblock/src/nvdisk.c,
        libblock/src/ramdisk-driver.c: Updated to the new error reporting
        in libblock.

        * libmisc/shell/main_ls.c, libmisc/shell/print-ls.c: Fix printing
        the size in long mode.

        * libnetworking/nfs/bootp_subr.c,
        libnetworking/rtems/rtems_bootp.c,
        libnetworking/rtems/rtems_bsdnet_internal.h: Return the BOOTP/DHCP
        to the forever behaviour of 4.9 with the ability to call BOOTP and
        control the process if required.
This commit is contained in:
Chris Johns
2010-02-18 00:24:25 +00:00
parent 7a115ee642
commit a9fa9b765d
55 changed files with 13475 additions and 53 deletions

View File

@@ -573,8 +573,9 @@ display(rtems_shell_ls_globals* globals, FTSENT *p, FTSENT *list)
maxlen = cur->fts_namelen;
if (needstats) {
sp = cur->fts_statp;
size = ((uint64_t) sp->st_blocks) * sp->st_blksize;
if (size < 0x100000000ULL)
if (sp->st_size < 0)
size = sp->st_size * -1;
else
size = sp->st_size;
if (sp->st_blocks > maxblock)
maxblock = sp->st_blocks;

View File

@@ -162,9 +162,10 @@ printlong(rtems_shell_ls_globals* globals, DISPLAY *dp)
} else {
#endif
{
unsigned long long size = sp->st_blocks;
size *= sp->st_blksize;
if (size < 0x100000000ULL)
unsigned long long size;
if (sp->st_size < 0)
size = sp->st_size * -1;
else
size = sp->st_size;
(void)printf("%*llu ", dp->s_size, size);
}