Browse Source

Print mediasize in human readable form as well.

tags/ggatessh-v1.0.0
pjd 20 years ago
parent
commit
16156ec0a3
3 changed files with 10 additions and 5 deletions
  1. +2
    -2
      ggatec/Makefile
  2. +2
    -2
      ggatel/Makefile
  3. +6
    -1
      shared/ggate.c

+ 2
- 2
ggatec/Makefile View File

@@ -9,7 +9,7 @@ SRCS= ggatec.c ggate.c
CFLAGS+= -DLIBGEOM CFLAGS+= -DLIBGEOM
CFLAGS+= -I${.CURDIR}/../shared CFLAGS+= -I${.CURDIR}/../shared


DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML}
LDADD= -lgeom -lsbuf -lbsdxml
DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
LDADD= -lgeom -lsbuf -lbsdxml -lutil


.include <bsd.prog.mk> .include <bsd.prog.mk>

+ 2
- 2
ggatel/Makefile View File

@@ -9,7 +9,7 @@ SRCS= ggatel.c ggate.c
CFLAGS+= -DLIBGEOM CFLAGS+= -DLIBGEOM
CFLAGS+= -I${.CURDIR}/../shared CFLAGS+= -I${.CURDIR}/../shared


DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML}
LDADD= -lgeom -lsbuf -lbsdxml
DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
LDADD= -lgeom -lsbuf -lbsdxml -lutil


.include <bsd.prog.mk> .include <bsd.prog.mk>

+ 6
- 1
shared/ggate.c View File

@@ -45,9 +45,11 @@
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
#include <libgen.h> #include <libgen.h>
#include <libutil.h>
#include <netdb.h> #include <netdb.h>
#include <syslog.h> #include <syslog.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdint.h>
#include <libgeom.h> #include <libgeom.h>


#include <geom/gate/g_gate.h> #include <geom/gate/g_gate.h>
@@ -259,6 +261,7 @@ static void
show_config(struct ggeom *gp, int verbose) show_config(struct ggeom *gp, int verbose)
{ {
struct gprovider *pp; struct gprovider *pp;
char buf[5];


pp = LIST_FIRST(&gp->lg_provider); pp = LIST_FIRST(&gp->lg_provider);
if (pp == NULL) if (pp == NULL)
@@ -274,7 +277,9 @@ show_config(struct ggeom *gp, int verbose)
printf("queue_count: %s\n", get_conf(gp, "queue_count")); printf("queue_count: %s\n", get_conf(gp, "queue_count"));
printf(" queue_size: %s\n", get_conf(gp, "queue_size")); printf(" queue_size: %s\n", get_conf(gp, "queue_size"));
printf(" references: %s\n", get_conf(gp, "ref")); printf(" references: %s\n", get_conf(gp, "ref"));
printf(" mediasize: %jd\n", pp->lg_mediasize);
humanize_number(buf, sizeof(buf), (int64_t)pp->lg_mediasize, "",
HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
printf(" mediasize: %jd (%s)\n", (intmax_t)pp->lg_mediasize, buf);
printf(" sectorsize: %u\n", pp->lg_sectorsize); printf(" sectorsize: %u\n", pp->lg_sectorsize);
printf(" mode: %s\n", pp->lg_mode); printf(" mode: %s\n", pp->lg_mode);
printf("\n"); printf("\n");


Loading…
Cancel
Save