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 ead1e7c7d1724aba7fff5693d474b166e5dc66d7..04a76129a3f62d2e199ad042c8d412bc4313deb0 100644 (file)
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -45,19 +45,18 @@ static time_t askremotedate(const char *host)
        unsigned long int nett, localt;
        int fd;
 
-       if (!(h = gethostbyname(host)))         /* get the IP addr */
-               perror_msg_and_die("%s", host);
-
-       if ((tserv = getservbyname("time", "tcp")) == NULL)   /* find port # */
-               perror_msg_and_die("%s", "time");
+       h = xgethostbyname(host);         /* get the IP addr */
+       memcpy(&s_in.sin_addr, h->h_addr, sizeof(s_in.sin_addr));
 
-       if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)    /* get net connection */
-               perror_msg_and_die("%s", "socket");
+       s_in.sin_port = htons(37);                /* find port # */
+       if ((tserv = getservbyname("time", "tcp")) != NULL)
+               s_in.sin_port = tserv->s_port;
 
-       memcpy(&s_in.sin_addr, h->h_addr, sizeof(s_in.sin_addr));
-       s_in.sin_port= tserv->s_port;
        s_in.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 */
                perror_msg_and_die("%s", host);
 
@@ -81,33 +80,25 @@ int rdate_main(int argc, char **argv)
 {
        time_t remote_time;
        int opt;
-       int setdate = 0;
-       int printdate= 0;
+       int setdate = 1;
+       int printdate = 1;
 
        /* 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) {
-                       default:
-                       case 'H':
-                               show_usage();
-                               break;
                        case 's':
-                               setdate++;
+                               printdate = 0;
+                               setdate = 1;
                                break;
                        case 'p':
-                               printdate++;
+                               printdate = 1;
+                               setdate = 0;
                                break;
+                       default:
+                               show_usage();
                }
        }
 
-       /* the default action is to set the date */
-       if (printdate==0 && setdate==0) setdate++;
-
        if (optind == argc)
                show_usage();