Changeset 8e5751e

Timestamp:

2015-07-29T23:10:58Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ee8307c

Parents:

69b94c3

Message:

Add RPC plugin directory to configure script instead of defaulting to
/tmp/rpcplugins.

Files:

• configure (modified) (11 diffs)
• protocols/rpc/rpc.c (modified) (3 diffs)

configure

@@ -16 +16 @@
 config='/var/lib/bitlbee/'
 plugindir='$prefix/lib/bitlbee/'
+rpcplugindir='$plugindir/rpc/'
 includedir='$prefix/include/bitlbee/'
 systemdsystemunitdir=''
@@ -32 +33 @@
 jabber="default-on"
 oscar="default-on"
-rpc="rpc-on"
 yahoo="default-on"
 
 twitter=1
 purple=0
+rpc=1
 
 doc=1
@@ -119 +120 @@
 --datadir=...                                           $datadir
 --plugindir=...                                         $plugindir
+--rpcplugindir=...                                      $rpcplugindir
 --systemdsystemunitdir=...                              $systemdsystemunitdir
 --pidfile=...                                           $pidfile
@@ -131 +133 @@
 --purple=0/1    Disable/enable libpurple support        $purple
                 (automatically disables other protocol modules)
---rpc=0/1       Disable/enable RPC interface            $rpc
+--rpc=0/1       Disable/enable RPC plugin interface     $rpc
 
 --doc=0/1       Disable/enable help.txt generation      $doc
@@ -166 +168 @@
 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
 plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
+rpcplugindir=$(eval echo "$rpcplugindir/" | sed 's/\/\{1,\}/\//g')
 includedir=`eval echo "$includedir"/ | sed 's/\/\{1,\}/\//g'`
 libevent=`eval echo "$libevent"/ | sed 's/\/\{1,\}/\//g'`
@@ -184 +187 @@
 DATADIR=$datadir
 PLUGINDIR=$plugindir
+RPCPLUGINDIR=$rpcplugindir
 CONFIG=$config
 INCLUDEDIR=$includedir
@@ -233 +237 @@
 #define VARDIR "$datadir"
 #define PLUGINDIR "$plugindir"
+#define RPCPLUGINDIR "$rpcplugindir"
 #define PIDFILE "$pidfile"
 #define IPCSOCKET "$ipcsocket"
@@ -254 +259 @@
         LDFLAGS="$LDFLAGS -fsanitize=address"
         debug=1
+fi
+
+if [ "$tsan" = "1" ]; then
+        echo
+        echo "Threaded BitlBee? Have a nice tall glass of http://imgur.com/gallery/tX4qxzS"
+        echo "No need to sanitise threads in a single-threaded process!"
 fi
 
@@ -644 +655 @@
 fi
 
+if [ "$rpc" = 0 ]; then
+        # Somewhat pointless at this stage already but at least this keeps it
+        # out of bitlbee.pc which is probably a good thing.
+        rpcplugindir=""
+fi
+
 otrprefix=""
 for i in / /usr /usr/local; do
@@ -730 +747 @@
 includedir=$includedir
 plugindir=$plugindir
+rpcplugindir=$rpcplugindir
 
 Name: bitlbee
@@ -919 +937 @@
 echo '  Using event handler: '$events
 echo '  Using SSL library: '$ssl
-#echo '  Building with these storage backends: '$STORAGES
 
 if [ -n "$protocols" ]; then

protocols/rpc/rpc.c

@@ -979 +979 @@
 }
 
-#define PDIR "/tmp/rpcplugins"
-
 /* YA RLY :-/ */
 #ifndef UNIX_PATH_MAX
@@ -988 +986 @@
 
 void rpc_initmodule() {
-        DIR *pdir = opendir(PDIR);
+        DIR *pdir = opendir(RPCPLUGINDIR);
         struct dirent *de;
 
@@ -998 +996 @@
                         continue;
 
-                char *fn = g_build_filename(PDIR, de->d_name, NULL);
+                char *fn = g_build_filename(RPCPLUGINDIR, de->d_name, NULL);
                 struct sockaddr_un su;