Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

de-ansify 

format better, now readable in most cases on 80-char wide screens
and it looks pretty.
This commit is contained in:
deraadt 1993-11-10 04:19:03 +00:00
parent b52aae9d1e
commit 85889786ad
1 changed files with 135 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
usr.bin/rusers/rusers.c
View File

@ -32,7 +32,7 @@
*/
#ifndef lint
static char rcsid[] = "$Id: rusers.c,v 1.4 1993/08/02 17:55:46 mycroft Exp $";
static char rcsid[] = "$Id: rusers.c,v 1.5 1993/11/10 04:19:03 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
@ -47,7 +47,7 @@ static char rcsid[] = "$Id: rusers.c,v 1.4 1993/08/02 17:55:46 mycroft Exp $";
#define MAX_INT 0x7fffffff
#define HOST_WIDTH 20
#define LINE_WIDTH 15
#define LINE_WIDTH 8
char *argv0;
int longopt;
@ -58,7 +58,9 @@ struct host_list {
struct in_addr addr;
} *hosts;
int search_host(struct in_addr addr)
int
search_host(addr)
struct in_addr addr;
{
struct host_list *hp;
@ -72,7 +74,9 @@ int search_host(struct in_addr addr)
return(0);
}
void remember_host(struct in_addr addr)
void
remember_host(addr)
struct in_addr addr;
{
struct host_list *hp;
@ -85,7 +89,9 @@ void remember_host(struct in_addr addr)
hosts = hp;
}
rusers_reply(char *replyp, struct sockaddr_in *raddrp)
rusers_reply(replyp, raddrp)
char *replyp;
struct sockaddr_in *raddrp;
{
int x, idle;
char date[32], idle_time[64], remote[64];
@ -108,7 +114,7 @@ rusers_reply(char *replyp, struct sockaddr_in *raddrp)
host = inet_ntoa(raddrp->sin_addr);
if (!longopt)
printf("%-*s ", HOST_WIDTH, host);
printf("%-*.*s ", HOST_WIDTH, HOST_WIDTH, host);
for (x = 0; x < up->utmpidlearr_len; x++) {
strncpy(date,
@ -130,29 +136,31 @@ rusers_reply(char *replyp, struct sockaddr_in *raddrp)
minutes = seconds/60;
seconds %= 60;
if (idle > 60)
sprintf(idle_time, "%d:%02d",
sprintf(idle_time, "%2d:%02d",
minutes, seconds);
if (idle >= (60*60))
sprintf(idle_time, "%d:%02d:%02d",
sprintf(idle_time, "%2d:%02d:%02d",
hours, minutes, seconds);
if (idle >= (24*60*60))
sprintf(idle_time, "%d days, %d:%02d:%02d",
days, hours, minutes, seconds);
}
strncpy(remote, up->utmpidlearr_val[x].ui_utmp.ut_host, sizeof(remote)-1);
strncpy(remote, up->utmpidlearr_val[x].ui_utmp.ut_host,
sizeof(remote)-1);
if (strlen(remote) != 0)
sprintf(remote, "(%.16s)", up->utmpidlearr_val[x].ui_utmp.ut_host);
sprintf(remote, "(%.16s)",
up->utmpidlearr_val[x].ui_utmp.ut_host);
if (longopt)
printf("%-8.8s %*s:%-*.*s %-12.12s %6s %.18s\n",
printf("%-8.8s %-*.*s:%-*.*s %-12.12s %8s %.18s\n",
up->utmpidlearr_val[x].ui_utmp.ut_name,
HOST_WIDTH, host,
LINE_WIDTH, LINE_WIDTH, up->utmpidlearr_val[x].ui_utmp.ut_line,
HOST_WIDTH, HOST_WIDTH, host,
LINE_WIDTH, LINE_WIDTH,
up->utmpidlearr_val[x].ui_utmp.ut_line,
date,
idle_time,
remote
);
remote);
else
printf("%s ",
up->utmpidlearr_val[x].ui_utmp.ut_name);
@ -164,7 +172,8 @@ rusers_reply(char *replyp, struct sockaddr_in *raddrp)
return(0);
}
onehost(char *host)
onehost(host)
char *host;
{
utmpidlearr up;
CLIENT *rusers_clnt;
@ -185,7 +194,8 @@ onehost(char *host)
}
bzero((char *)&up, sizeof(up));
if (clnt_call(rusers_clnt, RUSERSPROC_NAMES, xdr_void, NULL, xdr_utmpidlearr, &up, NULL) != RPC_SUCCESS) {
if (clnt_call(rusers_clnt, RUSERSPROC_NAMES, xdr_void, NULL,
xdr_utmpidlearr, &up, NULL) != RPC_SUCCESS) {
clnt_perror(rusers_clnt, argv0);
exit(1);
}
@ -199,9 +209,9 @@ allhosts()
enum clnt_stat clnt_stat;
bzero((char *)&up, sizeof(up));
clnt_stat = clnt_broadcast(RUSERSPROG, RUSERSVERS_IDLE, RUSERSPROC_NAMES,
xdr_void, NULL,
xdr_utmpidlearr, &up, rusers_reply);
clnt_stat = clnt_broadcast(RUSERSPROG, RUSERSVERS_IDLE,
RUSERSPROC_NAMES, xdr_void, NULL, xdr_utmpidlearr,
&up, rusers_reply);
if (clnt_stat != RPC_SUCCESS && clnt_stat != RPC_TIMEDOUT) {
fprintf(stderr, "%s: %s\n", argv0, clnt_sperrno(clnt_stat));
exit(1);
@ -214,7 +224,9 @@ usage()
exit(1);
}
main(int argc, char *argv[])
main(argc, argv)
int argc;
char *argv[];
{
int ch;
extern int optind;