X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=6fcccad05c1121a203e05e6f4d62c7aadd117a58;hb=33b33a0ac8a3f8f05c9bb0195c100306c00cce35;hp=1529c0faa13e16cdf96f6d1fbf6b2abe83a2716b;hpb=f3cb7cde0e6f10451b6848678d95860d512224b9;p=mmh diff --git a/uip/send.c b/uip/send.c index 1529c0f..6fcccad 100644 --- a/uip/send.c +++ b/uip/send.c @@ -252,27 +252,17 @@ main(int argc, char **argv) if ((cp = getenv("mhdist")) && *cp && (distsw = atoi(cp)) && altmsg) { vec[vecp++] = "-dist"; - distfile = getcpy(m_mktemp2(altmsg, invo_name, NULL, NULL)); - if (link(altmsg, distfile) == NOTOK) { - if (errno != EXDEV) { - adios(distfile, "unable to link %s to", - altmsg); - } - free(distfile); - distfile = getcpy(m_mktemp2(NULL, invo_name, - NULL, NULL)); - if ((in = open(altmsg, O_RDONLY)) == NOTOK) { - adios(altmsg, "unable to open"); - } - fstat(in, &st2); - if ((out = creat(distfile, (int)st2.st_mode & 0777)) == - NOTOK) { - adios(distfile, "unable to write"); - } - cpydata(in, out, altmsg, distfile); - close(in); - close(out); + if ((in = open(altmsg, O_RDONLY)) == NOTOK) { + adios(altmsg, "unable to open for reading"); + } + fstat(in, &st2); + distfile = getcpy(m_mktemp2(NULL, invo_name, NULL, NULL)); + if ((out = creat(distfile, (int)st2.st_mode & 0777))==NOTOK) { + adios(distfile, "unable to open for writing"); } + cpydata(in, out, altmsg, distfile); + close(in); + close(out); } else { distfile = NULL; } @@ -527,7 +517,6 @@ attach(char *draft_file_name) ** Note that mhbuild is in the context as buildmimeproc. */ sprintf(buf, "%s %s", buildmimeproc, composition_file_name); - if (system(buf) != 0) { /* some problem */ clean_up_temporary_files(); @@ -756,7 +745,6 @@ alert(char *file, int out) /* create subject for error notification */ snprintf(buf, sizeof(buf), "send failed on %s", forwsw ? "enclosed draft" : file); - execlp(mailproc, mhbasename(mailproc), getusername(), "-subject", buf, NULL); fprintf(stderr, "unable to exec ");