"printf (" -> "report (stdout,"
This commit is contained in:
14
src/util.c
14
src/util.c
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
$Id: util.c,v 1.37 2005/02/20 10:21:01 rocky Exp $
|
$Id: util.c,v 1.38 2005/02/20 10:23:26 rocky Exp $
|
||||||
|
|
||||||
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
|
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
|
||||||
|
|
||||||
@@ -460,13 +460,13 @@ print_fs_attrs(iso9660_stat_t *p_statbuf, bool b_rock, bool b_xa,
|
|||||||
char date_str[30];
|
char date_str[30];
|
||||||
|
|
||||||
if (yep == p_statbuf->b_rock && b_rock) {
|
if (yep == p_statbuf->b_rock && b_rock) {
|
||||||
printf ( " %s %d %d [LSN %6lu] ",
|
report (stdout, " %s %d %d [LSN %6lu] ",
|
||||||
iso9660_get_rock_attr_str (p_statbuf->st_mode),
|
iso9660_get_rock_attr_str (p_statbuf->st_mode),
|
||||||
p_statbuf->st_uid,
|
p_statbuf->st_uid,
|
||||||
p_statbuf->st_gid,
|
p_statbuf->st_gid,
|
||||||
(long unsigned int) p_statbuf->lsn);
|
(long unsigned int) p_statbuf->lsn);
|
||||||
} else if (b_xa) {
|
} else if (b_xa) {
|
||||||
printf ( " %s %d %d [fn %.2d] [LSN %6lu] ",
|
report (stdout, " %s %d %d [fn %.2d] [LSN %6lu] ",
|
||||||
iso9660_get_xa_attr_str (p_statbuf->xa.attributes),
|
iso9660_get_xa_attr_str (p_statbuf->xa.attributes),
|
||||||
uint16_from_be (p_statbuf->xa.user_id),
|
uint16_from_be (p_statbuf->xa.user_id),
|
||||||
uint16_from_be (p_statbuf->xa.group_id),
|
uint16_from_be (p_statbuf->xa.group_id),
|
||||||
@@ -474,18 +474,18 @@ print_fs_attrs(iso9660_stat_t *p_statbuf, bool b_rock, bool b_xa,
|
|||||||
(long unsigned int) p_statbuf->lsn);
|
(long unsigned int) p_statbuf->lsn);
|
||||||
|
|
||||||
if (uint16_from_be(p_statbuf->xa.attributes) & XA_ATTR_MODE2FORM2) {
|
if (uint16_from_be(p_statbuf->xa.attributes) & XA_ATTR_MODE2FORM2) {
|
||||||
printf ("%9u (%9u)",
|
report (stdout, "%9u (%9u)",
|
||||||
(unsigned int) p_statbuf->secsize * M2F2_SECTOR_SIZE,
|
(unsigned int) p_statbuf->secsize * M2F2_SECTOR_SIZE,
|
||||||
(unsigned int) p_statbuf->size);
|
(unsigned int) p_statbuf->size);
|
||||||
} else
|
} else
|
||||||
printf ("%9u", (unsigned int) p_statbuf->size);
|
report (stdout, "%9u", (unsigned int) p_statbuf->size);
|
||||||
} else {
|
} else {
|
||||||
printf (" %c %9u",
|
report (stdout," %c %9u",
|
||||||
(p_statbuf->type == _STAT_DIR) ? 'd' : '-',
|
(p_statbuf->type == _STAT_DIR) ? 'd' : '-',
|
||||||
(unsigned int) p_statbuf->size);
|
(unsigned int) p_statbuf->size);
|
||||||
}
|
}
|
||||||
strftime(date_str, sizeof(date_str), "%b %d %Y %H:%M ", &p_statbuf->tm);
|
strftime(date_str, sizeof(date_str), "%b %d %Y %H:%M ", &p_statbuf->tm);
|
||||||
printf (" %s %s\n", date_str,
|
report (stdout," %s %s\n", date_str,
|
||||||
yep == p_statbuf->b_rock && b_rock
|
yep == p_statbuf->b_rock && b_rock
|
||||||
? psz_name_untranslated : psz_name_translated);
|
? psz_name_untranslated : psz_name_translated);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user