diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-12 17:09:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-12 17:14:28 -0400 |
| commit | 48b3ae8fe02a526f5d84a1823731ac78433e0067 (patch) | |
| tree | 9792544158a19fe9f2f2764f43a246d63ce49215 | |
| parent | c3162d39bdc17f82ffd6b73677e23728e523a4b3 (diff) | |
| download | tor-48b3ae8fe02a526f5d84a1823731ac78433e0067.tar.gz tor-48b3ae8fe02a526f5d84a1823731ac78433e0067.zip | |
Move strlcpy and strlcat into src/ext too
| -rw-r--r-- | LICENSE | 2 | ||||
| -rw-r--r-- | src/common/include.am | 2 | ||||
| -rw-r--r-- | src/ext/README | 7 | ||||
| -rw-r--r-- | src/ext/include.am | 2 | ||||
| -rw-r--r-- | src/ext/strlcat.c (renamed from src/common/strlcat.c) | 0 | ||||
| -rw-r--r-- | src/ext/strlcpy.c (renamed from src/common/strlcpy.c) | 0 |
6 files changed, 10 insertions, 3 deletions
@@ -43,7 +43,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =============================================================================== -src/common/strlcat.c and src/common/strlcpy.c by Todd C. Miller are licensed +src/ext/strlcat.c and src/ext/strlcpy.c by Todd C. Miller are licensed under the following license: * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> diff --git a/src/common/include.am b/src/common/include.am index 7299a47afb..0fdc72057f 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -47,8 +47,6 @@ COMMONHEADERS = \ src/common/memarea.h \ src/common/mempool.h \ src/common/procmon.h \ - src/common/strlcat.c \ - src/common/strlcpy.c \ src/common/torgzip.h \ src/common/torint.h \ src/common/torlog.h \ diff --git a/src/ext/README b/src/ext/README index 2be58d4f45..2c303c1069 100644 --- a/src/ext/README +++ b/src/ext/README @@ -4,6 +4,13 @@ OpenBSD_malloc_Linux.c: The OpenBSD malloc implementation, ported to Linux. Used only when --enable-openbsd-malloc is passed to the configure script. +strlcat.c +strlcpy.c + + Implementations of strlcat and strlcpy, the more sane replacements + for strcat and strcpy. These are nonstandard, and some libc + implementations refuse to add them for religious reasons. + eventdns.[ch] A fork of Libevent's DNS implementation, used by Tor when Libevent diff --git a/src/ext/include.am b/src/ext/include.am index 1d5613406b..fa9ee94020 100644 --- a/src/ext/include.am +++ b/src/ext/include.am @@ -7,6 +7,8 @@ EXTHEADERS = \ src/ext/ht.h \ src/ext/eventdns.h \ src/ext/tinytest.h \ + src/ext/strlcat.c \ + src/ext/strlcpy.c \ src/ext/tinytest_macros.h noinst_HEADERS+= $(EXTHEADERS) diff --git a/src/common/strlcat.c b/src/ext/strlcat.c index 316733bccc..316733bccc 100644 --- a/src/common/strlcat.c +++ b/src/ext/strlcat.c diff --git a/src/common/strlcpy.c b/src/ext/strlcpy.c index 9fc47903a1..9fc47903a1 100644 --- a/src/common/strlcpy.c +++ b/src/ext/strlcpy.c |