X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=bdcd83be0713dfccea11824958cff9145bdbc411;hb=3df5ab3c116e6d4a2fb4bb5cc9dfc5f781825815;hp=e6d61dc521a3199e38a616bd0db05575f7949f33;hpb=47a78dcb28c6a836574f73f40b05d4adc9c3ad81;p=mmh

diff --git a/uip/send.c b/uip/send.c
index e6d61dc..bdcd83b 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -62,11 +62,12 @@ extern char *distfile;
 int
 main(int argc, char **argv)
 {
-	int msgp = 0, distsw = 0, vecp = 1;
+	int msgp = 0, msgp2 = 0, distsw = 0, vecp = 1;
 	int msgnum, status;
 	char *cp, *maildir = NULL;
 	char buf[BUFSIZ], **ap, **argp, **arguments;
 	char *msgs[MAXARGS], *vec[MAXARGS];
+	char *msgs2[MAXARGS];
 	struct msgs *mp;
 	struct stat st;
 
@@ -160,7 +161,7 @@ main(int argc, char **argv)
 		for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap;
 				ap++) {
 			vec[vecp++] = "-alias";
-			vec[vecp++] = *ap;
+			vec[vecp++] = getcpy(etcpath(*ap));
 		}
 	}
 
@@ -180,14 +181,22 @@ main(int argc, char **argv)
 		adios(NULL, "no messages in draft folder %s", draftfolder);
 
 	/* parse all the message ranges/sequences and set SELECTED */
-	for (msgnum = 0; msgnum < msgp; msgnum++)
-		if (!m_convert(mp, msgs[msgnum]))
+	msgp2 = 0;
+	for (msgnum = 0; msgnum < msgp; msgnum++) {
+		if (*msgs[msgnum] == '/') {
+			/* absolute path */
+			msgs2[msgp2++] = msgs[msgnum];
+			continue;
+		}
+		if (!m_convert(mp, msgs[msgnum])) {
 			done(1);
+		}
+	}
 	seq_setprev(mp);  /* set the previous-sequence */
 
 	for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 		if (is_selected(mp, msgnum)) {
-			msgs[msgp++] = getcpy(m_name(msgnum));
+			msgs2[msgp2++] = getcpy(m_name(msgnum));
 			unset_exists(mp, msgnum);
 		}
 	}
@@ -199,9 +208,9 @@ main(int argc, char **argv)
 		if ((cp = context_find("signature")) && *cp)
 			m_putenv("SIGNATURE", cp);
 
-	for (msgnum = 0; msgnum < msgp; msgnum++)
-		if (stat(msgs[msgnum], &st) == NOTOK)
-			adios(msgs[msgnum], "unable to stat draft file");
+	for (msgnum = 0; msgnum < msgp2; msgnum++)
+		if (stat(msgs2[msgnum], &st) == NOTOK)
+			adios(msgs2[msgnum], "unable to stat draft file");
 
 	if ((annotext = getenv("mhannotate")) == NULL || *annotext == 0)
 		annotext = NULL;
@@ -214,11 +223,7 @@ main(int argc, char **argv)
 		vec[vecp++] = "-dist";
 		distfile = getcpy(m_mktemp2(altmsg, invo_name, NULL, NULL));
 		if (link(altmsg, distfile) == NOTOK) {
-			if (errno != EXDEV
-#ifdef EISREMOTE
-					&& errno != EISREMOTE
-#endif /* EISREMOTE */
-				)
+			if (errno != EXDEV)
 				adios(distfile, "unable to link %s to",
 						altmsg);
 			free(distfile);
@@ -256,8 +261,8 @@ main(int argc, char **argv)
 	vec[0] = mhbasename(postproc);
 	closefds(3);
 
-	for (msgnum = 0; msgnum < msgp; msgnum++) {
-		switch (sendsbr(vec, vecp, msgs[msgnum], &st, 1)) {
+	for (msgnum = 0; msgnum < msgp2; msgnum++) {
+		switch (sendsbr(vec, vecp, msgs2[msgnum], &st, 1)) {
 		case DONE:
 			done(++status);
 		case NOTOK: