Page MenuHomeFreeBSD
Files F160356481

D16075.id44680.diff
No OneTemporary
Actions

D16075.id44680.diff
View Options

Index: usr.bin/rup/Makefile
===================================================================
--- usr.bin/rup/Makefile
+++ usr.bin/rup/Makefile
@@ -4,6 +4,4 @@
LIBADD= rpcsvc
-NO_WCAST_ALIGN= # Size is explicitly handled
-
.include <bsd.prog.mk>
Index: usr.bin/rup/rup.c
===================================================================
--- usr.bin/rup/rup.c
+++ usr.bin/rup/rup.c
@@ -120,26 +120,15 @@
printf("%-*s\t", HOST_WIDTH, host);
- if (sizeof(time_t) == sizeof(host_stat->curtime.tv_sec)) {
- tmp_time = localtime((time_t *)&host_stat->curtime.tv_sec);
- host_time = *tmp_time;
-
- host_stat->curtime.tv_sec -= host_stat->boottime.tv_sec;
-
- tmp_time = gmtime((time_t *)&host_stat->curtime.tv_sec);
- host_uptime = *tmp_time;
- }
- else { /* non-32-bit time_t */
- tmp_time_t = host_stat->curtime.tv_sec;
- tmp_time = localtime(&tmp_time_t);
- host_time = *tmp_time;
-
- host_stat->curtime.tv_sec -= host_stat->boottime.tv_sec;
-
- tmp_time_t = host_stat->curtime.tv_sec;
- tmp_time = gmtime(&tmp_time_t);
- host_uptime = *tmp_time;
- }
+ tmp_time_t = host_stat->curtime.tv_sec;
+ tmp_time = localtime(&tmp_time_t);
+ host_time = *tmp_time;
+
+ host_stat->curtime.tv_sec -= host_stat->boottime.tv_sec;
+
+ tmp_time_t = host_stat->curtime.tv_sec;
+ tmp_time = gmtime(&tmp_time_t);
+ host_uptime = *tmp_time;
#define updays (host_stat->curtime.tv_sec / 86400)
if (host_uptime.tm_yday != 0)
@@ -205,7 +194,7 @@
return(-1);
}
- addr.sin_addr.s_addr = *(int *)hp->h_addr;
+ memcpy(&addr.sin_addr.s_addr, hp->h_addr, sizeof(int));
rstat_reply(&host_stat, &addr);
clnt_destroy(rstat_clnt);
return (0);

File Metadata

Mime Type
text/plain
Expires
Wed, Jun 24, 3:43 PM (9 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34287217
Default Alt Text
D16075.id44680.diff (1 KB)

Event Timeline