===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rup/rup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/rup/rup.c	1996/06/26 05:38:52	1.2
--- src/usr.bin/rup/rup.c	1996/08/16 09:10:29	1.3
***************
*** 1,4 ****
! /*	$OpenBSD: rup.c,v 1.2 1996/06/26 05:38:52 deraadt Exp $	*/
  
  /*-
   * Copyright (c) 1993, John Brezak
--- 1,4 ----
! /*	$OpenBSD: rup.c,v 1.3 1996/08/16 09:10:29 deraadt Exp $	*/
  
  /*-
   * Copyright (c) 1993, John Brezak
***************
*** 34,40 ****
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: rup.c,v 1.2 1996/06/26 05:38:52 deraadt Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
--- 34,40 ----
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: rup.c,v 1.3 1996/08/16 09:10:29 deraadt Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
***************
*** 118,124 ****
  	case SORT_HOST:
  		return strcmp(d1->host, d2->host);
  	case SORT_LDAV:
! 		return d1->statstime.avenrun[0] 
  			- d2->statstime.avenrun[0];
  	case SORT_UPTIME:
  		return d1->statstime.boottime.tv_sec 
--- 118,124 ----
  	case SORT_HOST:
  		return strcmp(d1->host, d2->host);
  	case SORT_LDAV:
! 		return d1->statstime.avenrun[0]
  			- d2->statstime.avenrun[0];
  	case SORT_UPTIME:
  		return d1->statstime.boottime.tv_sec 
***************
*** 137,143 ****
          if (rup_data_idx >= rup_data_max) {
                  rup_data_max += 16;
                  rup_data = realloc (rup_data, 
! 				rup_data_max * sizeof(struct rup_data));
                  if (rup_data == NULL) {
                          err (1, NULL);
  			/* NOTREACHED */
--- 137,143 ----
          if (rup_data_idx >= rup_data_max) {
                  rup_data_max += 16;
                  rup_data = realloc (rup_data, 
! 		    rup_data_max * sizeof(struct rup_data));
                  if (rup_data == NULL) {
                          err (1, NULL);
  			/* NOTREACHED */
***************
*** 161,168 ****
  
  	if (!search_host(raddrp->sin_addr)) {
  		hp = gethostbyaddr((char *)&raddrp->sin_addr.s_addr,
! 			sizeof(struct in_addr), AF_INET);
! 
  		if (hp)
  			host = hp->h_name;
  		else
--- 161,167 ----
  
  	if (!search_host(raddrp->sin_addr)) {
  		hp = gethostbyaddr((char *)&raddrp->sin_addr.s_addr,
! 		    sizeof(struct in_addr), AF_INET);
  		if (hp)
  			host = hp->h_name;
  		else
***************
*** 170,180 ****
  
  		remember_host(raddrp->sin_addr);
  
! 		if (sort_type != SORT_NONE) {
  			remember_rup_data(host, host_stat);
! 		} else {
  			print_rup_data(host, host_stat);
- 		}
  	}
  
  	return (0);
--- 169,178 ----
  
  		remember_host(raddrp->sin_addr);
  
! 		if (sort_type != SORT_NONE)
  			remember_rup_data(host, host_stat);
! 		else
  			print_rup_data(host, host_stat);
  	}
  
  	return (0);
***************
*** 204,216 ****
  
  	if (host_uptime.tm_yday != 0)
  		sprintf(days_buf, "%3d day%s, ", host_uptime.tm_yday,
! 			(host_uptime.tm_yday > 1) ? "s" : "");
  	else
  		days_buf[0] = '\0';
  
  	if (host_uptime.tm_hour != 0)
  		sprintf(hours_buf, "%2d:%02d, ",
! 			host_uptime.tm_hour, host_uptime.tm_min);
  	else
  		if (host_uptime.tm_min != 0)
  			sprintf(hours_buf, "%2d mins, ", host_uptime.tm_min);
--- 202,214 ----
  
  	if (host_uptime.tm_yday != 0)
  		sprintf(days_buf, "%3d day%s, ", host_uptime.tm_yday,
! 		    (host_uptime.tm_yday > 1) ? "s" : "");
  	else
  		days_buf[0] = '\0';
  
  	if (host_uptime.tm_hour != 0)
  		sprintf(hours_buf, "%2d:%02d, ",
! 		    host_uptime.tm_hour, host_uptime.tm_min);
  	else
  		if (host_uptime.tm_min != 0)
  			sprintf(hours_buf, "%2d mins, ", host_uptime.tm_min);
***************
*** 219,232 ****
  
  	if (printtime)
  		printf(" %2d:%02d%cm", host_time.tm_hour % 12,
! 			host_time.tm_min,
! 			(host_time.tm_hour >= 12) ? 'p' : 'a');
  
  	printf(" up %9.9s%9.9s load average: %.2f %.2f %.2f\n",
! 		days_buf, hours_buf,
! 		(double)host_stat->avenrun[0]/FSCALE,
! 		(double)host_stat->avenrun[1]/FSCALE,
! 		(double)host_stat->avenrun[2]/FSCALE);
  
  	return(0);
  }
--- 217,230 ----
  
  	if (printtime)
  		printf(" %2d:%02d%cm", host_time.tm_hour % 12,
! 		    host_time.tm_min,
! 		    (host_time.tm_hour >= 12) ? 'p' : 'a');
  
  	printf(" up %9.9s%9.9s load average: %.2f %.2f %.2f\n",
! 	    days_buf, hours_buf,
! 	    (double)host_stat->avenrun[0]/FSCALE,
! 	    (double)host_stat->avenrun[1]/FSCALE,
! 	    (double)host_stat->avenrun[2]/FSCALE);
  
  	return(0);
  }
***************
*** 247,253 ****
  	}
  
  	bzero((char *)&host_stat, sizeof(host_stat));
! 	if (clnt_call(rstat_clnt, RSTATPROC_STATS, xdr_void, NULL, xdr_statstime, &host_stat, timeout) != RPC_SUCCESS) {
  		warnx("%s",  clnt_sperror(rstat_clnt, host));
  		return;
  	}
--- 245,252 ----
  	}
  
  	bzero((char *)&host_stat, sizeof(host_stat));
! 	if (clnt_call(rstat_clnt, RSTATPROC_STATS, xdr_void, NULL,
! 	    xdr_statstime, &host_stat, timeout) != RPC_SUCCESS) {
  		warnx("%s",  clnt_sperror(rstat_clnt, host));
  		return;
  	}
***************
*** 269,276 ****
  	}
  
  	clnt_stat = clnt_broadcast(RSTATPROG, RSTATVERS_TIME, RSTATPROC_STATS,
! 				   xdr_void, NULL,
! 				   xdr_statstime, &host_stat, rstat_reply);
  	if (clnt_stat != RPC_SUCCESS && clnt_stat != RPC_TIMEDOUT) {
  		warnx("%s", clnt_sperrno(clnt_stat));
  		exit(1);
--- 268,274 ----
  	}
  
  	clnt_stat = clnt_broadcast(RSTATPROG, RSTATVERS_TIME, RSTATPROC_STATS,
! 	    xdr_void, NULL, xdr_statstime, &host_stat, rstat_reply);
  	if (clnt_stat != RPC_SUCCESS && clnt_stat != RPC_TIMEDOUT) {
  		warnx("%s", clnt_sperrno(clnt_stat));
  		exit(1);
***************
*** 278,287 ****
  
  	if (sort_type != SORT_NONE) {
  		putchar('\n');
! 		qsort(rup_data, rup_data_idx, sizeof(struct rup_data), compare);
  
  		for (i = 0; i < rup_data_idx; i++) {
! 			print_rup_data(rup_data[i].host, &rup_data[i].statstime);
  		}
  	}
  }
--- 276,287 ----
  
  	if (sort_type != SORT_NONE) {
  		putchar('\n');
! 		qsort(rup_data, rup_data_idx, sizeof(struct rup_data),
! 		    compare);
  
  		for (i = 0; i < rup_data_idx; i++) {
! 			print_rup_data(rup_data[i].host,
! 			    &rup_data[i].statstime);
  		}
  	}
  }