X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Faidepost.c;h=7b637f548233be8400ce3e426b7dabbe526d8794;hb=4eb74b26380dfde31c86c685f0589e0c653aebf0;hp=3591ff8962fbd33c107050afafbbf27fc96f2c28;hpb=11b790da92082ff80b9060e0b1dc6678718601c8;p=citadel.git

diff --git a/citadel/aidepost.c b/citadel/aidepost.c
index 3591ff896..7b637f548 100644
--- a/citadel/aidepost.c
+++ b/citadel/aidepost.c
@@ -2,6 +2,22 @@
  * $Id$
  *
  * This is just a little hack to copy standard input to a message in Aide>
+ *
+ * Copyright (c) 1987-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -23,6 +39,7 @@
 #include <errno.h>
 #include <string.h>
 #include "citadel.h"
+#include "citadel_dirs.h"
 #include "config.h"
 
 #ifndef HAVE_SNPRINTF
@@ -33,7 +50,7 @@
 /*
  * Simplified function to generate a message in our format
  */
-static void ap_make_message(FILE *fp, char *target_room, char *author)
+static void ap_make_message(FILE *fp, char *target_room, char *author, char *subject)
 {
 	int a;
 	long bb, cc;
@@ -50,6 +67,9 @@ static void ap_make_message(FILE *fp, char *target_room, char *author)
 	putc(0, fp);
 	fprintf(fp, "O%s", target_room);
 	putc(0, fp);
+	if (strlen(subject) > 0) {
+		fprintf(fp, "U%s%c", subject, 0);
+	}
 	fprintf(fp, "N%s", NODENAME);
 	putc(0, fp);
 	putc('M', fp);
@@ -73,14 +93,25 @@ int main(int argc, char **argv)
 	char tempspool[64];
 	char target_room[ROOMNAMELEN];
 	char author[64];
+	char subject[256];
 	FILE *tempfp, *spoolfp;
 	int ch;
 	int i;
 
+	int relh=0;
+	int home=0;
+	char relhome[PATH_MAX]="";
+	char ctdldir[PATH_MAX]=CTDLDIR;
+
+	/* TODO: should we be able to calculate relative dirs? */
+	calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
+
+
 	get_config();
 
 	strcpy(target_room, "Aide");
 	strcpy(author, "Citadel");
+	strcpy(subject, "");
 	for (i=1; i<argc; ++i) {
 		if (!strncasecmp(argv[i], "-r", 2)) {
 			strncpy(target_room, &argv[i][2], sizeof(target_room));
@@ -89,16 +120,21 @@ int main(int argc, char **argv)
 		else if (!strncasecmp(argv[i], "-a", 2)) {
 			strncpy(author, &argv[i][2], sizeof(author));
 			author[sizeof(author)-1] = 0;
+		}
+		else if (!strncasecmp(argv[i], "-s", 2)) {
+			strncpy(subject, &argv[i][2], sizeof(subject));
+			subject[sizeof(subject)-1] = 0;
 		} else {
 			fprintf(stderr, "%s: usage: %s "
-					"[-rTargetRoom] [-aAuthor]\n",
+					"[-rTargetRoom] [-aAuthor] [-sSubject]\n",
 				argv[0], argv[0]);
 			exit(1);
 		}
 	}
 
 	snprintf(tempspool, sizeof tempspool,
-		"./network/spoolin/ap.%04lx",
+			 "%s/ap.%04lx",
+			 ctdl_netin_dir,
 		(long)getpid());
 
 	unlink(tempspool);
@@ -111,7 +147,7 @@ int main(int argc, char **argv)
 	}
 
 	/* Generate a message from stdin */
-	ap_make_message(tempfp, target_room, author);
+	ap_make_message(tempfp, target_room, author, subject);
 
 	/* Copy it to a new temp file in the spool directory */
 	rewind(tempfp);