test was the wrong way around

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

diff --git a/lib/compat.c b/lib/compat.c
index 9b411cd..1c185d9 100644 (file)
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -72,7 +72,7 @@
 #ifndef HAVE_MEMMOVE
  void *memmove(void *dest, const void *src, size_t n)
 {
-       memcpy(dest, src, n);
+       bcopy((char *) src, (char *) dest, n);
        return dest;
 }
 #endif
@@ -95,21 +95,6 @@
 }
 #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
-       slprintf(buf, 18, "%d.%d.%d.%d", 
-                (int)p[0], (int)p[1], (int)p[2], (int)p[3]);
-#else
-       slprintf(buf, 18, "%d.%d.%d.%d", 
-                (int)p[3], (int)p[2], (int)p[1], (int)p[0]);
-#endif
-       return buf;
-}
-#endif
 
 #ifndef HAVE_STRLCPY
 /* like strncpy but does not 0 fill the buffer and always null 
@@ -145,3 +130,56 @@
        return ret;
 }
 #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
+       slprintf(buf, 18, "%d.%d.%d.%d", 
+                (int)p[0], (int)p[1], (int)p[2], (int)p[3]);
+#else
+       slprintf(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 1;
+       }
+
+       if (sscanf(cp, "%u.%u.%u.%u", &a1, &a2, &a3, &a4) != 4 ||
+           a1 > 255 || a2 > 255 || a3 > 255 || a4 > 255) {
+               return 1;
+       }
+
+       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
+       return gettimeofday(tv, NULL);
+#else
+       return gettimeofday(tv);
+#endif
+}