소스 검색

Move strlcpy and strlcat into src/ext too

Nick Mathewson 11 년 전
부모
커밋
48b3ae8fe0
6개의 변경된 파일10개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      LICENSE
  2. 0 2
      src/common/include.am
  3. 7 0
      src/ext/README
  4. 2 0
      src/ext/include.am
  5. 0 0
      src/ext/strlcat.c
  6. 0 0
      src/ext/strlcpy.c

+ 1 - 1
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>

+ 0 - 2
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				\

+ 7 - 0
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

+ 2 - 0
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)

+ 0 - 0
src/common/strlcat.c → src/ext/strlcat.c


+ 0 - 0
src/common/strlcpy.c → src/ext/strlcpy.c