* ipc_c_tcp.c: don't hardcode BBSDIR path for unix domain sockets

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index da6ed721263350da5f15201022322f25c6096447..fd4c21f7ae5e0a7aa4a7fe45af9ffe45198e4a6b 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 573.3  2000/09/24 22:01:45  ajc
+ * ipc_c_tcp.c: don't hardcode BBSDIR path for unix domain sockets
+
  Revision 573.2  2000/09/21 04:16:44  ajc
  * Fixed logged_in_response() so it only displays responses during Citadel
    protocol sessions.  (This was affecting POP etc.)
@@ -2060,4 +2063,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
-

diff --git a/citadel/ipc_c_tcp.c b/citadel/ipc_c_tcp.c
index 2151c15900234153471d4c7757e18ec5d40ae321..9ae19f389e3c6d3fb2b357b04e93b1eb64099191 100644 (file)
--- a/citadel/ipc_c_tcp.c
+++ b/citadel/ipc_c_tcp.c
@@ -314,7 +314,7 @@ void attach_to_server(int argc, char **argv, char *hostbuf, char *portbuf)
 
        /* If we're using a unix domain socket we can do a bunch of stuff */
        if (!strcmp(cithost, UDS)) {
-               sprintf(sockpath, "%s/citadel.socket", BBSDIR);
+               sprintf(sockpath, "citadel.socket");
                serv_sock = uds_connectsock(sockpath);
                if (hostbuf != NULL) strcpy(hostbuf, cithost);
                if (portbuf != NULL) strcpy(portbuf, sockpath);

diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index b2c70005fe1bdbf4392f7f22b2345ccde90d3993..811775535b0bc2433ff4ae567a19dad15586e076 100644 (file)
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -148,6 +148,7 @@ int main(int argc, char **argv)
        signal(SIGTERM, cleanup);
 
        fprintf(stderr, "sendcommand: started.  pid=%ld\n", (long) getpid());
+       fprintf(stderr, "Running from %s\n", bbs_home_directory);
        fflush(stderr);
        np_attach_to_server();
        fflush(stderr);