Changeset 1696

Timestamp:

Apr 10, 2007, 2:27:46 AM (16 years ago)

Author:

joshe

Message:

Add strlcpy and strlcat from openbsd and use them when not provided by libc.

Location:

branches/daemon

Files:

• configure (modified) (1 diff)
• daemon/client.c (modified) (1 diff)
• daemon/daemon.c (modified) (1 diff)
• daemon/misc.c (modified) (1 diff)
• daemon/misc.h (modified) (1 diff)
• daemon/remote.c (modified) (1 diff)
• daemon/torrents.c (modified) (1 diff)
• libtransmission/internal.h (modified) (1 diff)
• libtransmission/strlcat.c (added)
• libtransmission/strlcpy.c (added)
• libtransmission/trcompat.h (added)
• mk/lib.mk (modified) (1 diff)

branches/daemon/configure

@@ -137 +137 @@
   then
     CFLAGS="$CFLAGS -DHAVE_LRINTF"
+  fi
+  rm -f testconf*
+}
+
+strlcpy_test()
+{
+  verbose strlcpy_test
+  cat > testconf.c << EOF
+#include <string.h>
+int main()
+{
+  char buf[] = "1234:p";
+  strlcpy( buf, "foo", sizeof buf );
+  return ( 0 == memcmp( buf, "foo\0:p, 6 ) ? 0 : 1 );
+}
+EOF
+  if runcmd $CC -o testconf testconf.c && runcmd ./testconf
+  then
+    CFLAGS="$CFLAGS -DHAVE_STRLCPY"
+  fi
+  rm -f testconf*
+}
+
+strlcat_test()
+{
+  verbose strlcat_test
+  cat > testconf.c << EOF
+#include <string.h>
+int main()
+{
+  char buf[] = "1234567:p";
+  buf[0] = '\0';
+  strlcat( buf, "foo", sizeof buf );
+  strlcat( buf, "bar", sizeof buf );
+  return ( 0 == memcmp( buf, "foobar\0:p, 6 ) ? 0 : 1 );
+}
+EOF
+  if runcmd $CC -o testconf testconf.c && runcmd ./testconf
+  then
+    CFLAGS="$CFLAGS -DHAVE_STRLCAT"
   fi
   rm -f testconf*

branches/daemon/daemon/client.c

@@ -43 +43 @@
 #include "ipc.h"
 #include "misc.h"
+#include "trcompat.h"
 
 /* time out server after this many seconds */

branches/daemon/daemon/daemon.c

@@ -45 +45 @@
 #include "server.h"
 #include "torrents.h"
+#include "trcompat.h"
 #include "version.h"
 

branches/daemon/daemon/misc.c

@@ -35 +35 @@
 #include "misc.h"
 #include "transmission.h"
+#include "trcompat.h"
 
 static void pushdir ( char *, const char *, size_t );

branches/daemon/daemon/misc.h

@@ -27 +27 @@
 
 #include <sys/types.h>
+#include <inttypes.h>
 #include <limits.h>
 

branches/daemon/daemon/remote.c

@@ -41 +41 @@
 #include "misc.h"
 #include "transmission.h"
+#include "trcompat.h"
 
 #define BESTDECIMAL(d)          (10.0 > (d) ? 2 : (100.0 > (d) ? 1 : 0))

branches/daemon/daemon/torrents.c

@@ -46 +46 @@
 #include "torrents.h"
 #include "transmission.h"
+#include "trcompat.h"
 
 #define EXIT_TIMEOUT 10         /* how many seconds to wait on exit */

branches/daemon/libtransmission/internal.h

@@ -131 +131 @@
 typedef enum { TR_NET_OK, TR_NET_ERROR, TR_NET_WAIT } tr_tristate_t;
 
+#include "trcompat.h"
 #include "platform.h"
 #include "bencode.h"

branches/daemon/mk/lib.mk

@@ -7 +7 @@
        metainfo.c sha1.c utils.c fdlimit.c clients.c completion.c \
        platform.c ratecontrol.c choking.c natpmp.c upnp.c http.c xml.c \
-       shared.c torrent.c
+       shared.c torrent.c strlcpy.c strlcat.c
 
 OBJS = $(SRCS:%.c=%.o)