Attachment 161045 Details for Bug 212076 – Proposed patch

[patch] Proposed patch

netkit-rwho-0.17-hostnamelen.patch (text/plain), 2.10 KB, created by Jiri Moskovcak on 2007-08-10 11:48:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Moskovcak

Created: 2007-08-10 11:48:37 UTC

Size: 2.10 KB

patch

obsolete

>Only in netkit-rwho-0.17mzk/: MCONFIG
>Only in netkit-rwho-0.17mzk/ruptime: a.out
>diff -urp netkit-rwho-0.17/ruptime/ruptime.c netkit-rwho-0.17mzk/ruptime/ruptime.c
>--- netkit-rwho-0.17/ruptime/ruptime.c	2007-08-10 13:29:10.000000000 +0200
>+++ netkit-rwho-0.17mzk/ruptime/ruptime.c	2007-08-10 13:46:08.000000000 +0200
>@@ -66,6 +66,7 @@ struct hs {
> 
> #define	ISDOWN(h)	(now - (h)->hs_recvtime > 11 * 60)
> #define	WHDRSIZE	((int)(sizeof (awhod) - sizeof (awhod.wd_we)))
>+#define HOSTNAMELEN 12
> 
> static size_t nhosts, hspace = 20;
> static struct hs *hs;
>@@ -93,10 +94,11 @@ main(int argc, char **argv)
> 	unsigned i;
> 	struct whod buf;
> 	int (*cmp)(const void *, const void *) = hscmp;
>+	int hostnamelen = HOSTNAMELEN;
> 	time_t correction;
> 
> 	aflg = 0;
>-	while ((ch = getopt(argc, argv, "alrut")) != -1)
>+	while ((ch = getopt(argc, argv, "alrutn:")) != -1)
> 		switch((char)ch) {
> 		case 'a':
> 			aflg = 1;
>@@ -113,6 +115,13 @@ main(int argc, char **argv)
> 		case 'u':
> 			cmp = ucmp;
> 			break;
>+		case 'n':
>+			hostnamelen = atoi(optarg+1);
>+			if(hostnamelen < 0){
>+				fprintf(stderr,"Error, hostname length can't be negative number!\n");
>+				exit(1);
>+			}
>+			break;
> 		default: 
> 			(void)fprintf(stderr, "usage: ruptime [-alrut]\n");
> 			exit(1);
>@@ -182,15 +191,20 @@ main(int argc, char **argv)
> 	}
> 	(void)time(&now);
> 	qsort(hs, nhosts, sizeof(hs[0]), cmp);
>+	char output_format[512];
>+	char *down_pattern = "%%-%i.%is%%s\n";
>+	char *up_pattern = "%%-%i.%is%%s,  %%4d user%%s  load %%*.2f, %%*.2f, %%*.2f\n";
> 	for (i = 0; i < nhosts; i++) {
> 		hsp = &hs[i];
> 		if (ISDOWN(hsp)) {
>-			(void)printf("%-12.12s%s\n", hsp->hs_hostname,
>+			sprintf(output_format, down_pattern, hostnamelen,hostnamelen);
>+			(void)printf(output_format, hsp->hs_hostname,
> 			    interval(now - hsp->hs_recvtime, "down"));
> 			continue;
> 		}
>+		sprintf(output_format, up_pattern, hostnamelen,hostnamelen);
> 		(void)printf(
>-		    "%-12.12s%s,  %4d user%s  load %*.2f, %*.2f, %*.2f\n",
>+		    output_format,
> 		    hsp->hs_hostname,
> 		    interval((time_t)hsp->hs_sendtime -
> 			(time_t)hsp->hs_boottime, "  up"),
>Only in netkit-rwho-0.17mzk/ruptime: ruptime.c~

Actions: View | Diff

Attachments on bug 212076: 161045 | 541982