Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mention the --executability option.
[rsync/rsync.git]
/
lib
/
compat.c
diff --git
a/lib/compat.c
b/lib/compat.c
index
e2380e1
..
97b40ff
100644
(file)
--- a/
lib/compat.c
+++ b/
lib/compat.c
@@
-1,5
+1,6
@@
/*
Copyright (C) Andrew Tridgell 1998
/*
Copyright (C) Andrew Tridgell 1998
+ Copyright (C) 2002 by Martin Pool
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-16,11
+17,15
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/*
- compatibility functions - replacing functions for platforms that don't
- have them.
+/**
+ * @file compat.c
+ *
+ * Reimplementations of standard functions for platforms that don't
+ * have them.
+ **/
+
+
- */
#include "rsync.h"
#include "rsync.h"
@@
-78,9
+83,11
@@
#endif
#ifndef HAVE_STRPBRK
#endif
#ifndef HAVE_STRPBRK
-/* Find the first ocurrence in S of any character in ACCEPT.
- derived from glibc
-*/
+/**
+ * Find the first ocurrence in @p s of any character in @p accept.
+ *
+ * Derived from glibc
+ **/
char *strpbrk(const char *s, const char *accept)
{
while (*s != '\0') {
char *strpbrk(const char *s, const char *accept)
{
while (*s != '\0') {
@@
-97,33
+104,45
@@
#ifndef HAVE_STRLCPY
#ifndef HAVE_STRLCPY
-/* like strncpy but does not 0 fill the buffer and always null
- terminates. bufsize is the size of the destination buffer */
+/**
+ * Like strncpy but does not 0 fill the buffer and always null
+ * terminates.
+ *
+ * @param bufsize is the size of the destination buffer.
+ *
+ * @return index of the terminating byte.
+ **/
size_t strlcpy(char *d, const char *s, size_t bufsize)
{
size_t len = strlen(s);
size_t ret = len;
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;
+ if (bufsize > 0) {
+ if (len >= bufsize)
+ len = bufsize-1;
+ memcpy(d, s, len);
+ d[len] = 0;
+ }
return ret;
}
#endif
#ifndef HAVE_STRLCAT
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 */
+/**
+ * Like strncat() but does not 0 fill the buffer and always null
+ * terminates.
+ *
+ * @param bufsize 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;
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) {
+ if (len1 < bufsize - 1) {
+ if (len2 >= bufsize - len1)
+ len2 = bufsize - len1 - 1;
memcpy(d+len1, s, len2);
d[len1+len2] = 0;
}
memcpy(d+len1, s, len2);
d[len1+len2] = 0;
}
@@
-136,18
+155,18
@@
{
unsigned char *p = (unsigned char *)&ip.s_addr;
static char buf[18];
{
unsigned char *p = (unsigned char *)&ip.s_addr;
static char buf[18];
-#if WORDS_BIGENDIAN
- s
l
printf(buf, 18, "%d.%d.%d.%d",
+#if
def
WORDS_BIGENDIAN
+ s
n
printf(buf, 18, "%d.%d.%d.%d",
(int)p[0], (int)p[1], (int)p[2], (int)p[3]);
#else
(int)p[0], (int)p[1], (int)p[2], (int)p[3]);
#else
- s
l
printf(buf, 18, "%d.%d.%d.%d",
+ s
n
printf(buf, 18, "%d.%d.%d.%d",
(int)p[3], (int)p[2], (int)p[1], (int)p[0]);
#endif
return buf;
}
#endif
(int)p[3], (int)p[2], (int)p[1], (int)p[0]);
#endif
return buf;
}
#endif
-#if
n
def REPLACE_INET_ATON
+#ifdef REPLACE_INET_ATON
int inet_aton(const char *cp, struct in_addr *inp)
{
unsigned int a1, a2, a3, a4;
int inet_aton(const char *cp, struct in_addr *inp)
{
unsigned int a1, a2, a3, a4;
@@
-155,12
+174,12
@@
if (strcmp(cp, "255.255.255.255") == 0) {
inp->s_addr = (unsigned) -1;
if (strcmp(cp, "255.255.255.255") == 0) {
inp->s_addr = (unsigned) -1;
- return
1
;
+ return
0
;
}
if (sscanf(cp, "%u.%u.%u.%u", &a1, &a2, &a3, &a4) != 4 ||
a1 > 255 || a2 > 255 || a3 > 255 || a4 > 255) {
}
if (sscanf(cp, "%u.%u.%u.%u", &a1, &a2, &a3, &a4) != 4 ||
a1 > 255 || a2 > 255 || a3 > 255 || a4 > 255) {
- return
1
;
+ return
0
;
}
ret = (a1 << 24) | (a2 << 16) | (a3 << 8) | a4;
}
ret = (a1 << 24) | (a2 << 16) | (a3 << 8) | a4;
@@
-177,7
+196,7
@@
/* some systems don't take the 2nd argument */
int sys_gettimeofday(struct timeval *tv)
{
/* some systems don't take the 2nd argument */
int sys_gettimeofday(struct timeval *tv)
{
-#if HAVE_GETTIMEOFDAY_TZ
+#if
def
HAVE_GETTIMEOFDAY_TZ
return gettimeofday(tv, NULL);
#else
return gettimeofday(tv);
return gettimeofday(tv, NULL);
#else
return gettimeofday(tv);