Author: uqs
Date: Thu Mar 10 08:24:33 2011
New Revision: 219449
URL: http://svn.freebsd.org/changeset/base/219449
Log:
Widen fields that display partition offset/length.
This makes partitions between 50GiB and 2TiB (16TiB for 4k drives) print
correctly aligned.
While here, fix type of secsize. g_sectorsize() returns ssize_t, don't
store this in an unsigned var. Bump WARNS to 6.
MFC after: 4 weeks
Modified:
head/sbin/bsdlabel/Makefile
head/sbin/bsdlabel/bsdlabel.c
Modified: head/sbin/bsdlabel/Makefile
==============================================================================
--- head/sbin/bsdlabel/Makefile Thu Mar 10 08:24:21 2011 (r219448)
+++ head/sbin/bsdlabel/Makefile Thu Mar 10 08:24:33 2011 (r219449)
@@ -12,7 +12,6 @@ LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disk
MLINKS= bsdlabel.8 disklabel.8
.endif
-WARNS?= 2
DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
LDADD= -lgeom -lbsdxml -lsbuf
Modified: head/sbin/bsdlabel/bsdlabel.c
==============================================================================
--- head/sbin/bsdlabel/bsdlabel.c Thu Mar 10 08:24:21 2011
(r219448)
+++ head/sbin/bsdlabel/bsdlabel.c Thu Mar 10 08:24:33 2011
(r219449)
@@ -105,7 +105,7 @@ static char tmpfil[] = PATH_TMPFILE;
static struct disklabel lab;
static u_char bootarea[BBSIZE];
static off_t mediasize;
-static u_int secsize;
+static ssize_t secsize;
static char blank[] = "";
static char unknown[] = "unknown";
@@ -589,11 +589,11 @@ display(FILE *f, const struct disklabel
}
fprintf(f, "%u partitions:\n", lp->d_npartitions);
fprintf(f,
- "# size offset fstype [fsize bsize bps/cpg]\n");
+ "# size offset fstype [fsize bsize bps/cpg]\n");
pp = lp->d_partitions;
for (i = 0; i < lp->d_npartitions; i++, pp++) {
if (pp->p_size) {
- fprintf(f, " %c: %8lu %8lu ", 'a' + i,
+ fprintf(f, " %c: %10lu %10lu ", 'a' + i,
(u_long)pp->p_size, (u_long)pp->p_offset);
if (pp->p_fstype < FSMAXTYPES)
fprintf(f, "%8.8s", fstypenames[pp->p_fstype]);
@@ -602,13 +602,13 @@ display(FILE *f, const struct disklabel
switch (pp->p_fstype) {
case FS_UNUSED: /* XXX */
- fprintf(f, " %5lu %5lu %5.5s ",
+ fprintf(f, " %5lu %5lu %2s",
(u_long)pp->p_fsize,
(u_long)(pp->p_fsize * pp->p_frag), "");
break;
case FS_BSDFFS:
- fprintf(f, " %5lu %5lu %5u ",
+ fprintf(f, " %5lu %5lu %5u",
(u_long)pp->p_fsize,
(u_long)(pp->p_fsize * pp->p_frag),
pp->p_cpg);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
