diff options
| author | Nick Kralevich <nnk@google.com> | 2012-11-15 16:12:12 -0800 |
|---|---|---|
| committer | Ben Cheng <bccheng@google.com> | 2012-11-15 20:52:51 -0800 |
| commit | d415ebef70b7b5165866cdf4b55b16aa075543f2 (patch) | |
| tree | 9b404bc3dca9e98a79f91cb9db2e73cd46ed497b | |
| parent | e644c9d23cce70bf4e7db4a63325e5dc8ba87363 (diff) | |
| download | ppp-d415ebef70b7b5165866cdf4b55b16aa075543f2.tar.gz | |
Get rid of strlcat / strlcpy
Android already has a version of strlcat / strlcpy. There's
no need for pppd to duplicate it.
Change-Id: Ie094cccc2d2b8553cf3c6629c6a79bf3b8db9d06
| -rw-r--r-- | pppd/pppd.h | 2 | ||||
| -rw-r--r-- | pppd/utils.c | 3 |
2 files changed, 5 insertions, 0 deletions
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 print_string __P((char *, int, void (*) (void *, char *, ...), 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 @@ struct buffer_info { 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 @@ strlcat(dest, src, len) return dlen + strlcpy(dest + dlen, src, (len > dlen? len - dlen: 0)); } +#endif /* |