Tweaked some whitespace to match the latest version from autoconf.

[rsync/rsync.git] / lib / compat.c

diff --git a/lib/compat.c b/lib/compat.c
index a783a01..5b7a269 100644 (file)
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -116,10 +116,12 @@
 {
        size_t len = strlen(s);
        size_t ret = len;
-       if (bufsize <= 0) return 0;
-       if (len >= bufsize) len = bufsize-1;
-       memcpy(d, s, len);
-       d[len] = 0;
+       if (bufsize > 0) {
+               if (len >= bufsize)
+                       len = bufsize-1;
+               memcpy(d, s, len);
+               d[len] = 0;
+       }
        return ret;
 }
 #endif
@@ -138,10 +140,9 @@
        size_t len2 = strlen(s);
        size_t ret = len1 + len2;
 
-       if (len1+len2 >= bufsize) {
-               len2 = bufsize - (len1+1);
-       }
-       if (len2 > 0) {
+       if (len1 < bufsize - 1) {
+               if (len2 >= bufsize - len1)
+                       len2 = bufsize - len1 - 1;
                memcpy(d+len1, s, len2);
                d[len1+len2] = 0;
        }
@@ -149,53 +150,10 @@
 }
 #endif
 
-#ifdef REPLACE_INET_NTOA
- char *rep_inet_ntoa(struct in_addr ip)
-{
-       unsigned char *p = (unsigned char *)&ip.s_addr;
-       static char buf[18];
-#if WORDS_BIGENDIAN
-       snprintf(buf, 18, "%d.%d.%d.%d", 
-                (int)p[0], (int)p[1], (int)p[2], (int)p[3]);
-#else
-       snprintf(buf, 18, "%d.%d.%d.%d", 
-                (int)p[3], (int)p[2], (int)p[1], (int)p[0]);
-#endif
-       return buf;
-}
-#endif
-
-#ifdef REPLACE_INET_ATON
- int inet_aton(const char *cp, struct in_addr *inp)
-{
-       unsigned int a1, a2, a3, a4;
-       unsigned long ret;
-
-       if (strcmp(cp, "255.255.255.255") == 0) {
-               inp->s_addr = (unsigned) -1;
-               return 0;
-       }
-
-       if (sscanf(cp, "%u.%u.%u.%u", &a1, &a2, &a3, &a4) != 4 ||
-           a1 > 255 || a2 > 255 || a3 > 255 || a4 > 255) {
-               return 0;
-       }
-
-       ret = (a1 << 24) | (a2 << 16) | (a3 << 8) | a4;
-
-       inp->s_addr = htonl(ret);
-       
-       if (inp->s_addr == (unsigned) -1) {
-               return 0;
-       }
-       return 1;
-}
-#endif
-
 /* some systems don't take the 2nd argument */
 int sys_gettimeofday(struct timeval *tv)
 {
-#if HAVE_GETTIMEOFDAY_TZ
+#ifdef HAVE_GETTIMEOFDAY_TZ
        return gettimeofday(tv, NULL);
 #else
        return gettimeofday(tv);