Changeset 1750

Timestamp:

Apr 18, 2007, 4:39:10 PM (15 years ago)

Author:

joshe

Message:

Merge daemon branch to trunk.

Location:

trunk

Files:

• AUTHORS (modified) (1 diff)
• cli/transmissioncli.1 (modified) (1 diff)
• configure (modified) (8 diffs)
• daemon (copied) (copied from branches/daemon/daemon)
• gtk/transmission-gtk.1 (modified) (1 diff)
• libtransmission/internal.h (modified) (1 diff)
• libtransmission/platform.c (modified) (3 diffs)
• libtransmission/strlcat.c (copied) (copied from branches/daemon/libtransmission/strlcat.c)
• libtransmission/strlcpy.c (copied) (copied from branches/daemon/libtransmission/strlcpy.c)
• libtransmission/trcompat.h (copied) (copied from branches/daemon/libtransmission/trcompat.h)
• mk/daemon.mk (copied) (copied from branches/daemon/mk/daemon.mk)
• mk/default.mk (modified) (4 diffs)
• mk/lib.mk (modified) (1 diff)

trunk/AUTHORS

@@ -11 +11 @@
  + Back-end
  + GTK+ interface
+ + Daemon interface
 
 Mitchell Livingston <livings124@gmail.com>

trunk/cli/transmissioncli.1

@@ -93 +93 @@
 .An Mitchell Livingston Aq livings124@gmail.com .
 .Sh SEE ALSO
-.Xr transmission-gtk 1
+.Xr transmission-daemon 1 ,
+.Xr transmission-gtk 1 ,
+.Xr transmission-proxy 1 ,
+.Xr transmission-remote 1
 .Pp
 http://transmission.m0k.org

trunk/configure

@@ -13 +13 @@
 OPENSSL=
 GTK=
+LIBEVENT=
 PREFIX=/usr/local
 CC="${CC-cc}"
@@ -31 +32 @@
   --disable-openssl      Disable OpenSSL, use built-in SHA1 implementation
   --disable-gtk          Don't build the GTK+ GUI
+  --disable-daemon       Don't build the daemon
   --prefix=PATH          Installation path
   --verbose              Display additional information for debugging
@@ -135 +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*
@@ -213 +255 @@
 }
 
+libevent_test()
+{
+  verbose libevent_test
+  cat > testconf.c <<EOF
+#include <sys/types.h>
+#include <sys/time.h>
+#include <event.h>
+int main()
+{
+    event_init();
+    return 0;
+}
+EOF
+
+  if runcmd $CC $CFLAGS -levent $LDFLAGS -o testconf testconf.c
+  then
+    LIBEVENT=yes
+    LDFLAGS_EVENT="-levent"
+    rm -f testconf*
+    return 0
+  fi
+
+  for event_testdir in $PREFIX /usr/local /usr/X11R6 /usr/pkg
+  do
+    if runcmd $CC $CFLAGS -I$event_testdir/include $LDFLAGS -levent \
+        -L$event_testdir/lib -o testconf testconf.c
+    then
+      LIBEVENT=yes
+      CFLAGS_EVENT="-I$event_testdir/include"
+      LDFLAGS_EVENT="-levent -L$event_testdir/lib"
+      rm -f testconf*
+      return 0
+    fi
+  done
+  LIBEVENT=no
+  rm -f testconf*
+  return 1
+}
+
 #
 # Parse options
@@ -222 +303 @@
     x--disable-openssl|x--without-openssl)
       OPENSSL=no
+      ;;
+    x--disable-daemon|x--without-daemon)
+      LIBEVENT=no
       ;;
     x--disable-gtk|x--without-gtk)
@@ -343 +427 @@
 
 #
+# libevent settings
+#
+echo -n "Daemon:  "
+if [ "$LIBEVENT" = no ]; then
+  echo "disabled"
+else
+  if libevent_test; then
+      echo "yes"
+  else
+      echo "no (can't find libevent)"
+  fi
+fi
+
+#
 # Math functions
 #
 lm_test
 lrintf_test
+
+#
+# String functions
+#
+strlcpy_test
+strlcat_test
 
 #
@@ -360 +464 @@
 OPENSSL        = $OPENSSL
 GTK            = $GTK
+DAEMON         = $LIBEVENT
 CC             = $CC
 CFLAGS         = $CFLAGS
@@ -367 +472 @@
 CFLAGS_GTK     = $CFLAGS_GTK
 LDFLAGS_GTK    = $LDFLAGS_GTK
+CFLAGS_EVENT   = $CFLAGS_EVENT
+LDFLAGS_EVENT  = $LDFLAGS_EVENT
 EOF
 

trunk/gtk/transmission-gtk.1

@@ -81 +81 @@
 .An Mitchell Livingston Aq livings124@gmail.com .
 .Sh SEE ALSO
-.Xr transmissioncli 1
+.Xr transmissioncli 1 ,
+.Xr transmission-daemon 1 ,
+.Xr transmission-proxy 1 ,
+.Xr transmission-remote 1
 .Pp
 http://transmission.m0k.org

trunk/libtransmission/internal.h

@@ -132 +132 @@
 typedef enum { TR_NET_OK, TR_NET_ERROR, TR_NET_WAIT } tr_tristate_t;
 
+#include "trcompat.h"
 #include "bsdqueue.h"
 #include "bsdtree.h"

trunk/libtransmission/platform.c

@@ -111 +111 @@
 #elif defined( SYS_DARWIN )
     snprintf( prefsDirectory, MAX_PATH_LENGTH,
-              "%s/Library/Caches/Transmission", tr_getHomeDirectory() );
+              "%s/Library/Application Support/Transmission",
+              tr_getHomeDirectory() );
 #elif defined(__AMIGAOS4__)
     snprintf( prefsDirectory, MAX_PATH_LENGTH, "PROGDIR:.transmission" );
@@ -148 +149 @@
               tr_getPrefsDirectory() );
 #elif defined( SYS_DARWIN )
-    snprintf( cacheDirectory, MAX_PATH_LENGTH, "%s",
-              tr_getPrefsDirectory() );
+    snprintf( cacheDirectory, MAX_PATH_LENGTH, "%s/Caches/Transmission",
+              tr_getHomeDirectory() );
 #else
     snprintf( cacheDirectory, MAX_PATH_LENGTH, "%s/cache",
@@ -181 +182 @@
               tr_getPrefsDirectory() );
 #elif defined( SYS_DARWIN )
-    snprintf( torrentsDirectory, MAX_PATH_LENGTH,
-              "%s/Library/Application Support/Transmission/Torrents",
+    snprintf( torrentsDirectory, MAX_PATH_LENGTH, "%s/Torrents",
               tr_getHomeDirectory() );
 #else

trunk/mk/default.mk

@@ -7 +7 @@
 ifeq ($(GTK),yes)
 TARGETS += .gtk
+endif
+ifeq ($(DAEMON),yes)
+TARGETS += .daemon
 endif
 ifeq ($(SYSTEM),BeOS)
@@ -26 +29 @@
         @$(MAKE) $(MAKEARGS) -C gtk -f ../mk/gtk.mk
 
+.daemon: .lib
+        @echo "* Building Transmission daemon client"
+        @$(MAKE) $(MAKEARGS) -C daemon -f ../mk/daemon.mk
+
 .beos: .lib
         @echo "* Building Transmission BeOS client"
@@ -40 +47 @@
         @$(MAKE) $(MAKEARGS) -C gtk -f ../mk/gtk.mk install
 
+.install.daemon: .daemon
+        @echo "* Installing Transmission daemon client"
+        @$(MAKE) $(MAKEARGS) -C daemon -f ../mk/daemon.mk install
+
 .install.beos:
 
@@ -53 +64 @@
         @$(MAKE) $(MAKEARGS) -C gtk -f ../mk/gtk.mk clean
 endif
+ifeq ($(DAEMON),yes)
+        @$(MAKE) $(MAKEARGS) -C daemon -f ../mk/daemon.mk clean
+endif
 ifeq ($(SYSTEM),BeOS)
         @$(MAKE) $(MAKEARGS) -C beos -f ../mk/beos.mk clean

trunk/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)