X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Frdate.c;h=0880edff50e5433680ed854176d9099fea497116;hb=4e5b07b0fed4be34ab3b22666e2a68e7ec2738d8;hp=e2824607eb35e68bd27f1bf33fabd0347635fea0;hpb=1b751c894b520846af8575d09187ce342e88778c;p=oweals%2Fbusybox.git diff --git a/util-linux/rdate.c b/util-linux/rdate.c index e2824607e..0880edff5 100644 --- a/util-linux/rdate.c +++ b/util-linux/rdate.c @@ -8,42 +8,25 @@ * Licensed under GPL v2 or later, see file License for details. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "libbb.h" -#include "busybox.h" +enum { RFC_868_BIAS = 2208988800UL }; - -static const int RFC_868_BIAS = 2208988800UL; - -static void socket_timeout(int sig) +static void socket_timeout(int sig UNUSED_PARAM) { bb_error_msg_and_die("timeout connecting to time server"); } static time_t askremotedate(const char *host) { - unsigned long nett; - struct sockaddr_in s_in; + uint32_t nett; int fd; - bb_lookup_host(&s_in, host); - s_in.sin_port = bb_lookup_port("time", "tcp", 37); - /* Add a timeout for dead or inaccessible servers */ alarm(10); signal(SIGALRM, socket_timeout); - fd = xconnect(&s_in); + fd = create_and_connect_stream_or_die(host, bb_lookup_port("time", "tcp", 37)); if (safe_read(fd, (void *)&nett, 4) != 4) /* read time from server */ bb_error_msg_and_die("%s did not send the complete time", host); @@ -51,38 +34,38 @@ static time_t askremotedate(const char *host) /* convert from network byte order to local byte order. * RFC 868 time is the number of seconds - * since 00:00 (midnight) 1 January 1900 GMT - * the RFC 868 time 2,208,988,800 corresponds to 00:00 1 Jan 1970 GMT - * Subtract the RFC 868 time to get Linux epoch + * since 00:00 (midnight) 1 January 1900 GMT + * the RFC 868 time 2,208,988,800 corresponds to 00:00 1 Jan 1970 GMT + * Subtract the RFC 868 time to get Linux epoch */ - - return(ntohl(nett) - RFC_868_BIAS); + + return ntohl(nett) - RFC_868_BIAS; } -int rdate_main(int argc, char **argv) +int rdate_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int rdate_main(int argc UNUSED_PARAM, char **argv) { time_t remote_time; - - unsigned long flags = bb_getopt_ulflags(argc, argv, "sp"); - - if (!flags || argc == optind) - bb_show_usage(); - + unsigned long flags; + + opt_complementary = "-1"; + flags = getopt32(argv, "sp"); + remote_time = askremotedate(argv[optind]); - if (flags & 1) { + if ((flags & 2) == 0) { time_t current_time; time(¤t_time); if (current_time == remote_time) - bb_error_msg("Current time matches remote time."); + bb_error_msg("current time matches remote time"); else if (stime(&remote_time) < 0) - bb_perror_msg_and_die("Could not set time of day"); - - /* No need to check for the -p flag as it's the only option left */ - - } else printf("%s", ctime(&remote_time)); + bb_perror_msg_and_die("cannot set time of day"); + } + + if ((flags & 1) == 0) + printf("%s", ctime(&remote_time)); return EXIT_SUCCESS; }