Merge "Get rid of strlcat / strlcpy"
diff --git a/pppd/pppd.h b/pppd/pppd.h
index 4c18d3d..9a86d99 100644
--- a/pppd/pppd.h
+++ b/pppd/pppd.h
@@ -506,8 +506,10 @@
void *)); /* Format a string for output */
int slprintf __P((char *, int, char *, ...)); /* sprintf++ */
int vslprintf __P((char *, int, char *, va_list)); /* vsprintf++ */
+#if !defined(ANDROID_CHANGES)
size_t strlcpy __P((char *, const char *, size_t)); /* safe strcpy */
size_t strlcat __P((char *, const char *, size_t)); /* safe strncpy */
+#endif
void dbglog __P((char *, ...)); /* log a debug message */
void info __P((char *, ...)); /* log an informational message */
void notice __P((char *, ...)); /* log a notice-level message */
diff --git a/pppd/utils.c b/pppd/utils.c
index 1ef4b3b..6a743ea 100644
--- a/pppd/utils.c
+++ b/pppd/utils.c
@@ -81,6 +81,8 @@
int len;
};
+#if !defined(ANDROID_CHANGES)
+
/*
* strlcpy - like strcpy/strncpy, doesn't overflow destination buffer,
* always leaves destination null-terminated (for len > 0).
@@ -118,6 +120,7 @@
return dlen + strlcpy(dest + dlen, src, (len > dlen? len - dlen: 0));
}
+#endif
/*
