diff options
| author |  John Kohl <jtkohl@mit.edu> | 1988-06-28 06:42:54 +0000 |
|---|---|---|
| committer | John Kohl <jtkohl@mit.edu> | 1988-06-28 06:42:54 +0000 |
| commit | f573a32f26ac591332bdfa84df640995a4f7ad6a (patch) | |
| tree | ff3066814e269398dd734c3be751535ee28de9d6 /clients/zstat/zstat.c | |
| parent | 7761bb53ee5c868cf9263c2b07df60965f9bb66b (diff) | |
change head to hm_head.
allocate only as many char *'s as necessary.
don't run past end of array when printing
Diffstat (limited to 'clients/zstat/zstat.c')
| -rw-r--r-- | clients/zstat/zstat.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/clients/zstat/zstat.c b/clients/zstat/zstat.c index 2ba3131..623ac9a 100644 --- a/clients/zstat/zstat.c +++ b/clients/zstat/zstat.c @@ -6,7 +6,7 @@ * $Source$ * $Author$ * - * Copyright (c) 1987 by the Massachusetts Institute of Technology. + * Copyright (c) 1987,1988 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file * "mit-copyright.h". */ @@ -27,7 +27,7 @@ static char rcsid_zstat_c[] = "$Header$"; extern long atol(); -char *head[20] = { "Current server =", +char *hm_head[] = { "Current server =", "Items in queue:", "Client packets received:", "Server packets received:", @@ -38,12 +38,14 @@ char *head[20] = { "Current server =", "Size:", "Machine type:" }; -char *srv_head[20] = { +#define HM_SIZE (sizeof(hm_head) / sizeof (char *)) +char *srv_head[] = { "Current server version =", "Packets handled:", "Uptime:", "Server states:", }; +#define SRV_SIZE (sizeof(srv_head) / sizeof (char *)) int serveronly = 0,hmonly = 0; int outoftime = 0; @@ -167,6 +169,7 @@ hm_stat(host,server) printf("Hostmanager stats: %s\n",hp->h_name); + (void) bzero((char *)¬ice, sizeof(notice)); notice.z_kind = STAT; notice.z_port = 0; notice.z_class = HM_STAT_CLASS; @@ -211,18 +214,18 @@ hm_stat(host,server) printf("HostManager protocol version = %s\n",notice.z_version); - for (i=0;i<nf;i++) { - if (!strncmp("Time",head[i],4)) { + for (i=0; (i < nf) && (i < HM_SIZE); i++) { + if (!strncmp("Time",hm_head[i],4)) { runtime = atol(line[i]); tim = gmtime(&runtime); - printf("%s %d days, %02d:%02d:%02d\n", head[i], + printf("%s %d days, %02d:%02d:%02d\n", hm_head[i], tim->tm_yday, tim->tm_hour, tim->tm_min, tim->tm_sec); } else - printf("%s %s\n",head[i],line[i]); + printf("%s %s\n",hm_head[i],line[i]); } printf("\n"); @@ -263,7 +266,8 @@ srv_stat(host) printf("Server stats: %s\n",hp->h_name); - notice.z_kind = UNACKED; + (void) bzero((char *)¬ice, sizeof(notice)); + notice.z_kind = UNSAFE; notice.z_port = 0; notice.z_class = ZEPHYR_ADMIN_CLASS; notice.z_class_inst = ""; @@ -305,7 +309,7 @@ srv_stat(host) printf("Server protocol version = %s\n",notice.z_version); - for (i=0; i<nf; i++) { + for (i=0; i < nf; i++) { if (i < 2) printf("%s %s\n",srv_head[i],line[i]); else if (i == 2) { /* uptime field */ |