vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Factor-out human-size printing.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-05-05 11:31:53 +02:00
parent 85002bf34a
commit 310d42144b
4 changed files with 42 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-05-05 Vladimir Serbinenko <phcoder@gmail.com>
Factor-out human-size printing.
2013-05-04 Vladimir Serbinenko <phcoder@gmail.com> 2013-05-04 Vladimir Serbinenko <phcoder@gmail.com>
Agglomerate more mallocs to speed-up gfxterm. Agglomerate more mallocs to speed-up gfxterm.

31
grub-core/commands/ls.c
View file

@ -43,8 +43,6 @@ static const struct grub_arg_option options[] =
{0, 0, 0, 0, 0, 0} {0, 0, 0, 0, 0, 0}
}; };
static const char grub_human_sizes[] = {' ', 'K', 'M', 'G', 'T'};
/* Helper for grub_ls_list_devices. */ /* Helper for grub_ls_list_devices. */
static int static int
grub_ls_print_devices (const char *name, void *data) grub_ls_print_devices (const char *name, void *data)
@ -143,34 +141,7 @@ print_files_long (const char *filename, const struct grub_dirhook_info *info,
if (! ctx->human) if (! ctx->human)
grub_printf ("%-12llu", (unsigned long long) file->size); grub_printf ("%-12llu", (unsigned long long) file->size);
else else
{ grub_printf ("%-12s", grub_get_human_size (file->size, 1));
grub_uint64_t fsize = file->size * 100ULL;
grub_uint64_t fsz = file->size;
int units = 0;
char buf[20];
while (fsz / 1024)
{
fsize = (fsize + 512) / 1024;
fsz /= 1024;
units++;
}
if (units)
{
grub_uint64_t whole, fraction;
whole = grub_divmod64 (fsize, 100, &fraction);
grub_snprintf (buf, sizeof (buf),
"%" PRIuGRUB_UINT64_T
".%02" PRIuGRUB_UINT64_T "%c", whole, fraction,
grub_human_sizes[units]);
grub_printf ("%-12s", buf);
}
else
grub_printf ("%-12llu", (unsigned long long) file->size);
}
grub_file_close (file); grub_file_close (file);
grub_free (pathname); grub_free (pathname);
} }

34
grub-core/normal/misc.c
View file

@ -28,6 +28,40 @@
#include <grub/i18n.h> #include <grub/i18n.h>
#include <grub/partition.h> #include <grub/partition.h>
static const char *grub_human_sizes[] = {N_("B"), N_("KiB"), N_("MiB"), N_("GiB"), N_("TiB")};
static const char *grub_human_short_sizes[] = {"", "K", "M", "G", "T"};
const char *
grub_get_human_size (grub_uint64_t size, int sh)
{
grub_uint64_t fsize = size * 100ULL;
grub_uint64_t fsz = size;
int units = 0;
static char buf[20];
while (fsz / 1024)
{
fsize = (fsize + 512) / 1024;
fsz /= 1024;
units++;
}
if (units)
{
grub_uint64_t whole, fraction;
whole = grub_divmod64 (fsize, 100, &fraction);
grub_snprintf (buf, sizeof (buf),
"%" PRIuGRUB_UINT64_T
".%02" PRIuGRUB_UINT64_T "%s", whole, fraction,
sh ? grub_human_short_sizes[units] : _(grub_human_sizes[units]));
}
else
grub_snprintf (buf, sizeof (buf), "%llu%s", (unsigned long long) size,
sh ? grub_human_short_sizes[units] : _(grub_human_sizes[units]));
return buf;
}
/* Print the information on the device NAME. */ /* Print the information on the device NAME. */
grub_err_t grub_err_t
grub_normal_print_device_info (const char *name) grub_normal_print_device_info (const char *name)

3
include/grub/normal.h
View file

@ -150,4 +150,7 @@ grub_dyncmd_get_cmd (grub_command_t cmd);
void void
grub_gettext_reread_prefix (const char *val); grub_gettext_reread_prefix (const char *val);
const char *
grub_get_human_size (grub_uint64_t size, int sh);
#endif /* ! GRUB_NORMAL_HEADER */ #endif /* ! GRUB_NORMAL_HEADER */