added --existing option, similar to one suggested by Gildas Quiniou <gildas@stip.fr>

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

diff --git a/lib/compat.c b/lib/compat.c
index f47275f..8580fdb 100644 (file)
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -36,7 +36,7 @@
 #endif
 
 #ifndef HAVE_GETCWD
-char *getcwd(char *buf, int size)
+ char *getcwd(char *buf, int size)
 {
        return getwd(buf);
 }
@@ -44,17 +44,35 @@ char *getcwd(char *buf, int size)
 
 
 #ifndef HAVE_WAITPID
-pid_t waitpid(pid_t pid, int *statptr, int options)
+ pid_t waitpid(pid_t pid, int *statptr, int options)
 {
+#ifdef HAVE_WAIT4
        return wait4(pid, statptr, options, NULL);
+#else
+       /* If wait4 is also not available, try wait3 for SVR3 variants */
+       /* Less ideal because can't actually request a specific pid */
+       /* At least the WNOHANG option is supported */
+       /* Code borrowed from apache fragment written by dwd@bell-labs.com */
+       int tmp_pid, dummystat;;
+       if (kill(pid, 0) == -1) {
+               errno = ECHILD;
+               return -1;
+       }
+       if (statptr == NULL)
+               statptr = &dummystat;
+       while (((tmp_pid = wait3(statptr, options, 0)) != pid) &&
+                   (tmp_pid != -1) && (tmp_pid != 0) && (pid != -1))
+           ;
+       return tmp_pid;
+#endif
 }
 #endif
 
 
 #ifndef HAVE_MEMMOVE
-void *memmove(void *dest, const void *src, size_t n)
+ void *memmove(void *dest, const void *src, size_t n)
 {
-       memcpy(dest, src, n);
+       bcopy((char *) src, (char *) dest, n);
        return dest;
 }
 #endif
@@ -63,7 +81,7 @@ void *memmove(void *dest, const void *src, size_t n)
 /* Find the first ocurrence in S of any character in ACCEPT.  
    derived from glibc 
 */
-char *strpbrk(const char *s, const char *accept)
+ char *strpbrk(const char *s, const char *accept)
 {
        while (*s != '\0')  {
                const char *a = accept;
@@ -78,17 +96,68 @@ char *strpbrk(const char *s, const char *accept)
 #endif
 
 #ifdef REPLACE_INET_NTOA
-char *rep_inet_ntoa(struct in_addr ip)
+ 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, 17, "%d.%d.%d.%d", 
+       slprintf(buf, 18, "%d.%d.%d.%d", 
                 (int)p[0], (int)p[1], (int)p[2], (int)p[3]);
 #else
-       slprintf(buf, 17, "%d.%d.%d.%d", 
+       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 
+   terminates. bufsize is the size of the destination buffer */
+ size_t strlcpy(char *d, const char *s, size_t bufsize)
+{
+       size_t len = strlen(s);
+       size_t ret = len;
+       if (len >= bufsize) len = bufsize-1;
+       memcpy(d, s, len);
+       d[len] = 0;
+       return ret;
+}
+#endif
+
+#ifndef HAVE_STRLCAT
+/* like strncat but does not 0 fill the buffer and always null 
+   terminates. bufsize is the length of the buffer, which should
+   be one more than the maximum resulting string length */
+ size_t strlcat(char *d, const char *s, size_t bufsize)
+{
+       size_t len1 = strlen(d);
+       size_t len2 = strlen(s);
+       size_t ret = len1 + len2;
+
+       if (len1+len2 >= bufsize) {
+               len2 = bufsize - (len1+1);
+       }
+       if (len2 > 0) {
+               memcpy(d+len1, s, len2);
+               d[len1+len2] = 0;
+       }
+       return ret;
+}
+#endif
+
+#ifndef HAVE_INET_ATON
+ int inet_aton(const char *cp, struct in_addr *inp)
+{
+       if (strcmp(cp, "255.255.255.255") == 0) {
+               inp->s_addr = (unsigned) -1;
+               return 1;
+       }
+
+       inp->s_addr = inet_addr(cp);
+       if (inp->s_addr == (unsigned) -1) {
+               return 0;
+       }
+       return 1;
+}
+#endif