mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
Size optimization for rdate from Vladimir
This commit is contained in:
parent
8269396491
commit
40eaa9f0bb
56
rdate.c
56
rdate.c
@ -33,16 +33,11 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include "busybox.h"
|
#include "busybox.h"
|
||||||
#define BB_DECLARE_EXTERN
|
|
||||||
#include "messages.c"
|
|
||||||
|
|
||||||
|
|
||||||
static const int RFC_868_BIAS = 2208988800UL;
|
static const int RFC_868_BIAS = 2208988800UL;
|
||||||
|
|
||||||
static int setdate= 0;
|
static time_t askremotedate(const char *host)
|
||||||
static int printdate= 0;
|
|
||||||
|
|
||||||
static time_t askremotedate(char *host)
|
|
||||||
{
|
{
|
||||||
struct hostent *h;
|
struct hostent *h;
|
||||||
struct sockaddr_in sin;
|
struct sockaddr_in sin;
|
||||||
@ -50,32 +45,25 @@ static time_t askremotedate(char *host)
|
|||||||
unsigned long int nett, localt;
|
unsigned long int nett, localt;
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
if (!(h = gethostbyname(host))) { /* get the IP addr */
|
if (!(h = gethostbyname(host))) /* get the IP addr */
|
||||||
perror_msg("%s", host);
|
perror_msg_and_die("%s", host);
|
||||||
return(-1);
|
|
||||||
}
|
if ((tserv = getservbyname("time", "tcp")) == NULL) /* find port # */
|
||||||
if ((tserv = getservbyname("time", "tcp")) == NULL) { /* find port # */
|
perror_msg_and_die("%s", "time");
|
||||||
perror_msg("%s", "time");
|
|
||||||
return(-1);
|
if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) /* get net connection */
|
||||||
}
|
perror_msg_and_die("%s", "socket");
|
||||||
if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) { /* get net connection */
|
|
||||||
perror_msg("%s", "socket");
|
|
||||||
return(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
memcpy(&sin.sin_addr, h->h_addr, sizeof(sin.sin_addr));
|
memcpy(&sin.sin_addr, h->h_addr, sizeof(sin.sin_addr));
|
||||||
sin.sin_port= tserv->s_port;
|
sin.sin_port= tserv->s_port;
|
||||||
sin.sin_family = AF_INET;
|
sin.sin_family = AF_INET;
|
||||||
|
|
||||||
if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) { /* connect to time server */
|
if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) /* connect to time server */
|
||||||
perror_msg("%s", host);
|
perror_msg_and_die("%s", host);
|
||||||
close(fd);
|
|
||||||
return(-1);
|
if (read(fd, (void *)&nett, 4) != 4) /* read time from server */
|
||||||
}
|
error_msg_and_die("%s did not send the complete time", host);
|
||||||
if (read(fd, (void *)&nett, 4) != 4) { /* read time from server */
|
|
||||||
close(fd);
|
|
||||||
error_msg("%s did not send the complete time", host);
|
|
||||||
}
|
|
||||||
close(fd);
|
close(fd);
|
||||||
|
|
||||||
/* convert from network byte order to local byte order.
|
/* convert from network byte order to local byte order.
|
||||||
@ -93,6 +81,8 @@ int rdate_main(int argc, char **argv)
|
|||||||
{
|
{
|
||||||
time_t time;
|
time_t time;
|
||||||
int opt;
|
int opt;
|
||||||
|
int setdate = 0;
|
||||||
|
int printdate= 0;
|
||||||
|
|
||||||
/* Interpret command line args */
|
/* Interpret command line args */
|
||||||
/* do special-case option parsing */
|
/* do special-case option parsing */
|
||||||
@ -118,20 +108,18 @@ int rdate_main(int argc, char **argv)
|
|||||||
/* the default action is to set the date */
|
/* the default action is to set the date */
|
||||||
if (printdate==0 && setdate==0) setdate++;
|
if (printdate==0 && setdate==0) setdate++;
|
||||||
|
|
||||||
if (optind == argc) {
|
if (optind == argc)
|
||||||
show_usage();
|
show_usage();
|
||||||
}
|
|
||||||
|
|
||||||
if ((time= askremotedate(argv[optind])) == (time_t)-1) {
|
time = askremotedate(argv[optind]);
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
if (setdate) {
|
if (setdate) {
|
||||||
if (stime(&time) < 0)
|
if (stime(&time) < 0)
|
||||||
perror_msg_and_die("Could not set time of day");
|
perror_msg_and_die("Could not set time of day");
|
||||||
}
|
}
|
||||||
if (printdate) {
|
|
||||||
|
if (printdate)
|
||||||
printf("%s", ctime(&time));
|
printf("%s", ctime(&time));
|
||||||
}
|
|
||||||
|
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -33,16 +33,11 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include "busybox.h"
|
#include "busybox.h"
|
||||||
#define BB_DECLARE_EXTERN
|
|
||||||
#include "messages.c"
|
|
||||||
|
|
||||||
|
|
||||||
static const int RFC_868_BIAS = 2208988800UL;
|
static const int RFC_868_BIAS = 2208988800UL;
|
||||||
|
|
||||||
static int setdate= 0;
|
static time_t askremotedate(const char *host)
|
||||||
static int printdate= 0;
|
|
||||||
|
|
||||||
static time_t askremotedate(char *host)
|
|
||||||
{
|
{
|
||||||
struct hostent *h;
|
struct hostent *h;
|
||||||
struct sockaddr_in sin;
|
struct sockaddr_in sin;
|
||||||
@ -50,32 +45,25 @@ static time_t askremotedate(char *host)
|
|||||||
unsigned long int nett, localt;
|
unsigned long int nett, localt;
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
if (!(h = gethostbyname(host))) { /* get the IP addr */
|
if (!(h = gethostbyname(host))) /* get the IP addr */
|
||||||
perror_msg("%s", host);
|
perror_msg_and_die("%s", host);
|
||||||
return(-1);
|
|
||||||
}
|
if ((tserv = getservbyname("time", "tcp")) == NULL) /* find port # */
|
||||||
if ((tserv = getservbyname("time", "tcp")) == NULL) { /* find port # */
|
perror_msg_and_die("%s", "time");
|
||||||
perror_msg("%s", "time");
|
|
||||||
return(-1);
|
if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) /* get net connection */
|
||||||
}
|
perror_msg_and_die("%s", "socket");
|
||||||
if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) { /* get net connection */
|
|
||||||
perror_msg("%s", "socket");
|
|
||||||
return(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
memcpy(&sin.sin_addr, h->h_addr, sizeof(sin.sin_addr));
|
memcpy(&sin.sin_addr, h->h_addr, sizeof(sin.sin_addr));
|
||||||
sin.sin_port= tserv->s_port;
|
sin.sin_port= tserv->s_port;
|
||||||
sin.sin_family = AF_INET;
|
sin.sin_family = AF_INET;
|
||||||
|
|
||||||
if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) { /* connect to time server */
|
if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) /* connect to time server */
|
||||||
perror_msg("%s", host);
|
perror_msg_and_die("%s", host);
|
||||||
close(fd);
|
|
||||||
return(-1);
|
if (read(fd, (void *)&nett, 4) != 4) /* read time from server */
|
||||||
}
|
error_msg_and_die("%s did not send the complete time", host);
|
||||||
if (read(fd, (void *)&nett, 4) != 4) { /* read time from server */
|
|
||||||
close(fd);
|
|
||||||
error_msg("%s did not send the complete time", host);
|
|
||||||
}
|
|
||||||
close(fd);
|
close(fd);
|
||||||
|
|
||||||
/* convert from network byte order to local byte order.
|
/* convert from network byte order to local byte order.
|
||||||
@ -93,6 +81,8 @@ int rdate_main(int argc, char **argv)
|
|||||||
{
|
{
|
||||||
time_t time;
|
time_t time;
|
||||||
int opt;
|
int opt;
|
||||||
|
int setdate = 0;
|
||||||
|
int printdate= 0;
|
||||||
|
|
||||||
/* Interpret command line args */
|
/* Interpret command line args */
|
||||||
/* do special-case option parsing */
|
/* do special-case option parsing */
|
||||||
@ -118,20 +108,18 @@ int rdate_main(int argc, char **argv)
|
|||||||
/* the default action is to set the date */
|
/* the default action is to set the date */
|
||||||
if (printdate==0 && setdate==0) setdate++;
|
if (printdate==0 && setdate==0) setdate++;
|
||||||
|
|
||||||
if (optind == argc) {
|
if (optind == argc)
|
||||||
show_usage();
|
show_usage();
|
||||||
}
|
|
||||||
|
|
||||||
if ((time= askremotedate(argv[optind])) == (time_t)-1) {
|
time = askremotedate(argv[optind]);
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
if (setdate) {
|
if (setdate) {
|
||||||
if (stime(&time) < 0)
|
if (stime(&time) < 0)
|
||||||
perror_msg_and_die("Could not set time of day");
|
perror_msg_and_die("Could not set time of day");
|
||||||
}
|
}
|
||||||
if (printdate) {
|
|
||||||
|
if (printdate)
|
||||||
printf("%s", ctime(&time));
|
printf("%s", ctime(&time));
|
||||||
}
|
|
||||||
|
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user