Move strlcpy and strlcat into src/ext too

diff --git a/LICENSE b/LICENSE
index bf90e614aea26bf9f548bff1710187882c422032..47eaf974a2aa67d331dd2419919a8358e1484811 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -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 7299a47afb159f0369bd96e226149a7e0ce7cfa4..0fdc72057f07f4ff261cbc85168423a423cf1249 100644 (file)
--- 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 2be58d4f45c78474336af8e357bd14757d1ce0a8..2c303c106939da0f7fa11217e679cd3d6664a11f 100644 (file)
--- 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 1d5613406b454c55eac5b48e26252fd849516c45..fa9ee9402046243e1f64de8f859e842479c1d3f0 100644 (file)
--- 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
similarity index 100%
rename from src/common/strlcat.c
rename to src/ext/strlcat.c

diff --git a/src/common/strlcpy.c b/src/ext/strlcpy.c
similarity index 100%
rename from src/common/strlcpy.c
rename to src/ext/strlcpy.c