#include <time.h>
int debugsw = 0; /* global */
-int verbosesw = 0;
-char *altmsg = NULL;
+char *altmsg = NULL;
char *annotext = NULL;
char *distfile = NULL;
debugsw++;
/* fall */
case VERBSW:
- verbosesw += 2;
case NVERBSW:
- verbosesw--;
vec[vecp++] = --cp;
continue;
}
static int
sendsbr(char **vec, int vecp, char *drft, struct stat *st)
{
- int status;
+ int status, dupfd;
char buffer[BUFSIZ];
char *original_draft;
status = sendaux(vec, vecp, drft, st) ? NOTOK : OK;
if (status == OK) {
/* move original draft to +trash folder */
- snprintf(buffer, sizeof buffer,
- "</dev/null refile -file %s +trash",
- original_draft);
- if (system(buffer) != 0) {
+ /* temporary close stdin, for refile not to ask */
+ dupfd = dup(0);
+ close(0);
+ if (execprogl("refile", "refile", "-file",
+ original_draft, "+trash",
+ (char *)NULL) != 0) {
advise(NULL, "unable to trash the draft");
}
+ dup2(dupfd, 0);
+ close(dupfd);
}
break;
fclose(composition_file);
/* We're ready to roll! */
- sprintf(buf, "mhbuild %s", composition_file_name);
- if (system(buf) != 0) {
+ if (execprogl("mhbuild", "mhbuild", composition_file_name,
+ (char *)NULL) != 0) {
/* some problem */
clean_up_temporary_files();
return (NOTOK);
char buf[BUFSIZ];
int dosign = 0;
int doenc = 0;
+ int ret;
if (!(draft_file = fopen(draft_file_name, "r"))) {
adios(NULL, "can't open draft file `%s'.", draft_file_name);
strcpy(composition_file_name, draft_file_name);
/* We're ready to roll! */
- sprintf(buf, "mhsign -m%s '%s'", doenc ? " -e" : "",
- draft_file_name);
- if (system(buf) != 0) {
+ if (doenc) {
+ ret = execprogl("mhsign", "mhsign", "-m", "-e",
+ draft_file_name, (char *)NULL);
+ } else {
+ ret = execprogl("mhsign", "mhsign", "-m",
+ draft_file_name, (char *)NULL);
+ }
+ if (ret != 0) {
/* some problem */
return (NOTOK);
}
if (annotext) {
anno(st);
}
- }
- else {
+ } else {
+ /* spost failed */
advise(NULL, "%s", strexit(status));
- if (verbosesw <= 0) {
- advise(NULL, "Try using -v to get better output");
- }
if (distfile) {
unlink(drft);
if (rename(backup, drft) == NOTOK) {
struct stat st2;
char *msgs, *folder;
char buf[BUFSIZ];
+ char *vec[MAXARGS];
+ int vecp;
+ char *cp, *dp;
if (altmsg && (stat(altmsg, &st2) == NOTOK ||
st->st_mtime != st2.st_mtime ||
advise(NULL, "annotate as `%s': %s %s", annotext,
folder, msgs);
}
- snprintf(buf, sizeof buf, "anno -comp '%s' '+%s' %s",
- annotext, folder, msgs);
- if (system(buf) != 0) {
+ vec[vecp++] = "anno";
+ vec[vecp++] = "-comp";
+ vec[vecp++] = annotext;
+ snprintf(buf, sizeof buf, "+%s", folder);
+ vec[vecp++] = buf;
+
+ while (isspace(*msgs)) {
+ msgs++;
+ }
+ for (cp=dp=msgs; *cp; cp++) {
+ if (isspace(*cp)) {
+ while (isspace(*cp)) {
+ *cp++ = '\0';
+ }
+ vec[vecp++] = dp;
+ dp = cp;
+ }
+ }
+ vec[vecp++] = dp;
+ vec[vecp] = NULL;
+ if (execprog(*vec, vec) != 0) {
advise(NULL, "unable to annotate");
}
}
return "spost or sendmail killed by signal";
}
if (!WIFEXITED(status)) {
- return "sendmail stopt for unknown reasen, message not deliverd to anyone";
+ return "message not delivered to anyone";
}
switch (WEXITSTATUS(status)) {
- case EX_TEMPFAIL:
- return "Temporary error, maby the MTA hase queued the Mail";
- default:
- return "sendmail stopt for unknown reasen, message not deliverd to anyone";
+ case EX_TEMPFAIL:
+ return "Temporary error, maybe the MTA has queued the message";
+ default:
+ return "message not delivered to anyone";
}
}