projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make cp and mv optionally preserve hard links.
[oweals/busybox.git]
/
util-linux
/
rdate.c
diff --git
a/util-linux/rdate.c
b/util-linux/rdate.c
index 5f31282fc8abf4ac7416757a7cba96abcc95909d..04a76129a3f62d2e199ad042c8d412bc4313deb0 100644
(file)
--- a/
util-linux/rdate.c
+++ b/
util-linux/rdate.c
@@
-40,25
+40,24
@@
static const int RFC_868_BIAS = 2208988800UL;
static time_t askremotedate(const char *host)
{
struct hostent *h;
static time_t askremotedate(const char *host)
{
struct hostent *h;
- struct sockaddr_in sin;
+ struct sockaddr_in s
_
in;
struct servent *tserv;
unsigned long int nett, localt;
int fd;
struct servent *tserv;
unsigned long int nett, localt;
int fd;
-
if (!(h = gethostbyname(host)))
/* get the IP addr */
-
perror_msg_and_die("%s", host
);
+
h = xgethostbyname(host);
/* get the IP addr */
+
memcpy(&s_in.sin_addr, h->h_addr, sizeof(s_in.sin_addr)
);
- if ((tserv = getservbyname("time", "tcp")) == NULL) /* find port # */
- perror_msg_and_die("%s", "time");
+ s_in.sin_port = htons(37); /* find port # */
+ if ((tserv = getservbyname("time", "tcp")) != NULL)
+ s_in.sin_port = tserv->s_port;
- if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) /* get net connection */
- perror_msg_and_die("%s", "socket");
+ s_in.sin_family = AF_INET;
- memcpy(&sin.sin_addr, h->h_addr, sizeof(sin.sin_addr));
- sin.sin_port= tserv->s_port;
- sin.sin_family = AF_INET;
+ if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) /* get net connection */
+ perror_msg_and_die("socket");
- if (connect(fd, (struct sockaddr *)&s
in, sizeof(s
in)) < 0) /* connect to time server */
+ if (connect(fd, (struct sockaddr *)&s
_in, sizeof(s_
in)) < 0) /* connect to time server */
perror_msg_and_die("%s", host);
if (read(fd, (void *)&nett, 4) != 4) /* read time from server */
perror_msg_and_die("%s", host);
if (read(fd, (void *)&nett, 4) != 4) /* read time from server */
@@
-79,47
+78,39
@@
static time_t askremotedate(const char *host)
int rdate_main(int argc, char **argv)
{
int rdate_main(int argc, char **argv)
{
- time_t time;
+ time_t
remote_
time;
int opt;
int opt;
- int setdate =
0
;
- int printdate
= 0
;
+ int setdate =
1
;
+ int printdate
= 1
;
/* Interpret command line args */
/* Interpret command line args */
- /* do special-case option parsing */
- if (argv[1] && (strcmp(argv[1], "--help") == 0))
- show_usage();
-
- /* do normal option parsing */
- while ((opt = getopt(argc, argv, "Hsp")) > 0) {
+ while ((opt = getopt(argc, argv, "sp")) > 0) {
switch (opt) {
switch (opt) {
- default:
- case 'H':
- show_usage();
- break;
case 's':
case 's':
- setdate++;
+ printdate = 0;
+ setdate = 1;
break;
case 'p':
break;
case 'p':
- printdate++;
+ printdate = 1;
+ setdate = 0;
break;
break;
+ default:
+ show_usage();
}
}
}
}
- /* the default action is to set the date */
- if (printdate==0 && setdate==0) setdate++;
-
if (optind == argc)
show_usage();
if (optind == argc)
show_usage();
- time = askremotedate(argv[optind]);
+
remote_
time = askremotedate(argv[optind]);
if (setdate) {
if (setdate) {
- if (stime(&time) < 0)
+ if (stime(&
remote_
time) < 0)
perror_msg_and_die("Could not set time of day");
}
if (printdate)
perror_msg_and_die("Could not set time of day");
}
if (printdate)
- printf("%s", ctime(&time));
+ printf("%s", ctime(&
remote_
time));
return EXIT_SUCCESS;
}
return EXIT_SUCCESS;
}