X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=textclient%2Fsrc%2Fcitadel_ipc.c;h=f1722f71b0bcb245bf110815b608f627e18e26a8;hb=9f5cbe94056b6e740eea98c573564453faac29f3;hp=8a65f85d92c92d92f0d9006c24f3cef0dba69789;hpb=e5b0ab22468d49791f864e1648ded8d0173a6b2e;p=citadel.git

diff --git a/textclient/src/citadel_ipc.c b/textclient/src/citadel_ipc.c
index 8a65f85d9..f1722f71b 100644
--- a/textclient/src/citadel_ipc.c
+++ b/textclient/src/citadel_ipc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2016 by the citadel.org team
  *
  *  This program is open source software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 3.
@@ -40,10 +40,7 @@
 #include <pthread.h>
 #endif
 #include <libcitadel.h>
-///#include "citadel.h"
 #include "citadel_ipc.h"
-//#include "citadel_decls.h"
-//#include "citadel_dirs.h"
 #ifdef THREADED_CLIENT
 pthread_mutex_t rwlock;
 #endif
@@ -69,8 +66,6 @@ char ctdl_run_dir[PATH_MAX]="";
 char ctdl_etc_dir[PATH_MAX]="";
 char ctdl_home_directory[PATH_MAX] = "";
 char file_citadel_socket[PATH_MAX]="";
-char file_citadel_config[PATH_MAX]="";
-
 
 char *viewdefs[]={
         "Messages",
@@ -87,12 +82,12 @@ char *axdefs[]={
         "Local User",
         "Network User",
         "Preferred User",
-        "Aide",
-        "Sysop"
+        "Admin",
+        "Admin"
         };
 
 
-INLINE void CtdlIPC_lock(CtdlIPC *ipc)
+void CtdlIPC_lock(CtdlIPC *ipc)
 {
 	if (ipc->network_status_cb) ipc->network_status_cb(1);
 #ifdef THREADED_CLIENT
@@ -101,7 +96,7 @@ INLINE void CtdlIPC_lock(CtdlIPC *ipc)
 }
 
 
-INLINE void CtdlIPC_unlock(CtdlIPC *ipc)
+void CtdlIPC_unlock(CtdlIPC *ipc)
 {
 #ifdef THREADED_CLIENT
 	pthread_mutex_unlock(&(ipc->mutex));
@@ -181,12 +176,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 			 ctdl_run_dir);
 	StripSlashes(file_citadel_socket, 0);
 
-	snprintf(file_citadel_config, 
-			 sizeof file_citadel_config,
-			 "%scitadel.config",
-			 ctdl_autoetc_dir);
-	StripSlashes(file_citadel_config, 0);
-
 	DBG_PRINT(ctdl_run_dir);
 	DBG_PRINT(file_citadel_socket);
 	DBG_PRINT(ctdl_etc_dir);
@@ -1520,7 +1509,7 @@ int CtdlIPCFileUpload(CtdlIPC *ipc, const char *save_as, const char *comment,
 		return -3;
 
 	MimeType = GuessMimeType(&MimeTestBuf[0], len);
-	aaa = (char *)malloc(strlen(save_as) + strlen(comment) + 7);
+	aaa = (char *)malloc(strlen(save_as) + strlen(MimeType) + strlen(comment) + 7);
 	if (!aaa) return -1;
 
 	sprintf(aaa, "UOPN %s|%s|%s", save_as, MimeType,  comment);
@@ -2277,22 +2266,6 @@ int CtdlIPCInternalProgram(CtdlIPC *ipc, int secret, char *cret)
 
 
 
-/*
- * Not implemented:
- * 
- * CHAT
- * ETLS
- * EXPI
- * GTLS
- * IGAB
- * MSG3
- * MSG4
- * NDOP
- * NETP
- * NUOP
- * SMTP
- */
-
 
 /* ************************************************************************** */
 /*	     Stuff below this line is not for public consumption	    */
@@ -3362,6 +3335,7 @@ CtdlIPC* CtdlIPC_new(int argc, char **argv, char *hostbuf, char *portbuf)
 		else {
 			snprintf(sockpath, sizeof sockpath, "%s/%s", citport, "citadel.socket");
 		}
+		printf("[%s]\n", sockpath);
 		ipc->sock = uds_connectsock(&(ipc->isLocal), sockpath);
 		if (ipc->sock == -1) {
 			ifree(ipc);
@@ -3374,6 +3348,7 @@ CtdlIPC* CtdlIPC_new(int argc, char **argv, char *hostbuf, char *portbuf)
 		return ipc;
 	}
 
+	printf("[%s:%s]\n", cithost, citport);
 	ipc->sock = tcp_connectsock(cithost, citport);
 	if (ipc->sock == -1) {
 		ifree(ipc);