** attach files This option attaches the named files to
** the draft.
**
-** alist [-ln] This option lists the attachments on the
-** draft. -l gets long listings, -n gets
-** numbered listings.
+** alist This option lists the attachments on the
+** draft.
**
** detach files This option removes attachments from the
** detach -n numbers draft. This can be done by file name or
#define ATTACHCMDSW 11
{ "attach", 0 },
#define DETACHCMDSW 12
- { "detach [-n]", 2 },
+ { "detach [-n]", 0 },
#define ALISTCMDSW 13
- { "alist [-ln] ", 2 },
+ { "alist", 0 },
{ NULL, 0 }
};
static int editfile(char **, char **, char *, int, struct msgs *,
char *, char *, int);
static int sendfile(char **, char *, int);
+static int refile(char **, char *);
static int removefile(char *);
static void writelscmd(char *, int, char **);
static void writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp);
char file[MAXPATHLEN + 1]; /* file name buffer */
char shell[MAXPATHLEN + 1]; /* shell response buffer */
FILE *f; /* read pointer for bgnd proc */
- char *l; /* set on -l to alist command */
- int n; /* set on -n to alist command */
+ int n; /* set on -n to detach command */
#ifdef LOCALE
setlocale(LC_ALL, "");
** Get the initial current working directory.
*/
- if (getcwd(cwd, sizeof (cwd)) == NULL) {
+ if (!getcwd(cwd, sizeof (cwd))) {
adios("getcwd", "could not get working directory");
}
drft = cp;
}
- if ((drft == NULL && (drft = getenv("mhdraft")) == NULL) || *drft == 0)
+ if ((!drft && !(drft = getenv("mhdraft"))) || !*drft)
drft = getcpy(m_draft(seq_cur));
msgnam = (cp = getenv("mhaltmsg")) && *cp ? getcpy(cp) : NULL;
if ((cp = getenv("mhuse")) && *cp)
use = atoi(cp);
- if (ed == NULL && ((ed = getenv("mheditor")) == NULL || *ed == 0)) {
+ if (!ed && (!(ed = getenv("mheditor")) || !*ed)) {
ed = NULL;
nedit++;
}
/* display the msg being replied to or distributed */
if (msgnam) {
snprintf(buf, sizeof buf, "%s '%s'",
- lproc, msgnam);
+ listproc, msgnam);
system(buf);
} else {
advise(NULL, "no alternate message to display");
case LISTSW:
/* display the draft file */
- snprintf(buf, sizeof buf, "%s '%s'", lproc, drft);
+ snprintf(buf, sizeof buf, "%s '%s'", listproc, drft);
system(buf);
break;
case REFILEOPT:
/* Refile the draft */
- if (refile(++argp, drft) == 0)
+ if (refile(++argp, drft) == 0) {
done(0);
+ }
break;
case CDCMDSW:
} else {
writesomecmd(buf, BUFSIZ, "cd", "pwd", argp);
}
- if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
+ if ((f = popen_in_dir(cwd, buf, "r"))) {
fgets(cwd, sizeof (cwd), f);
- if (strchr(cwd, '\n') != NULL)
- *strchr(cwd, '\n') = '\0';
+ if (strchr(cwd, '\n'))
+ *strchr(cwd, '\n') = '\0';
pclose(f);
} else {
case ALISTCMDSW:
/*
- ** List attachments on current draft. Options are:
- **
- ** -l long listing (full path names)
- ** -n numbers listing
+ ** List attachments on current draft.
*/
-
- l = NULL;
- n = 0;
-
- while (*++argp != NULL) {
- if (strcmp(*argp, "-l") == 0)
- l = "/";
-
- else if (strcmp(*argp, "-n") == 0)
- n = 1;
-
- else if (strcmp(*argp, "-ln") == 0 ||
- strcmp(*argp, "-nl") == 0) {
- l = "/";
- n = 1;
- } else {
- n = -1;
- break;
- }
+ snprintf(buf, sizeof buf, "anno -list -comp '%s' "
+ "-number all -text IGNORE '%s'",
+ attach_hdr, drft);
+ if (system(buf) != 0) {
+ advise(NULL, "Could not list attachment headers.");
}
-
- if (n == -1)
- advise(NULL, "usage is alist [-ln].");
-
- else
- annolist(drft, attach_hdr, l, n);
-
break;
case ATTACHCMDSW:
** working directory to relative path names.
** Add the attachment annotation to the draft.
*/
- if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
- while (fgets(shell, sizeof (shell), f)
- != NULL) {
+ if ((f = popen_in_dir(cwd, buf, "r"))) {
+ char buf[BUFSIZ];
+
+ while (fgets(shell, sizeof(shell), f)) {
*(strchr(shell, '\n')) = '\0';
if (*shell == '/')
- annotate(drft, attach_hdr,
- shell, 0,
- -2, 1, 0);
+ sprintf(file, "%s", shell);
else {
sprintf(file, "%s/%s", cwd,
shell);
- annotate(drft, attach_hdr,
- file, 0,
- -2, 1, 0);
+ }
+ snprintf(buf, sizeof buf,
+ "anno -nodate -append "
+ "-comp '%s' -text '%s'"
+ " '%s'",
+ attach_hdr, file,
+ drft);
+ if (system(buf) != 0) {
+ advise(NULL, "Could not add attachment header.");
}
}
** names and numbers aren't allowed, so this
** catches a -n anywhere in the argument list.
*/
-
for (n = 0, arguments = argp + 1;
*arguments != NULL;
arguments++) {
** just processed after processing each one so
** that the numbering stays correct.
*/
-
if (n == 1) {
- for (arguments = argp + 1;
- *arguments != NULL;
+ for (arguments=argp+1; *arguments;
arguments++) {
if (strcmp(*arguments, "-n") == 0)
continue;
if (**arguments != '\0') {
+ char buf[BUFSIZ];
+
n = atoi(*arguments);
- annotate(drft, attach_hdr,
- NULL, 0,
- n, 1, 0);
+ snprintf(buf, sizeof buf, "anno -delete -comp '%s' -number '%d' '%s'", attach_hdr, n, drft);
+ if (system(buf) != 0) {
+ advise(NULL, "Could not delete attachment header.");
+ }
- for (argp = arguments + 1; *argp != NULL; argp++) {
+ for (argp=arguments+1; *argp;
+ argp++) {
if (atoi(*argp) > n) {
if (atoi(*argp) == 1)
*argp = "";
}
}
}
+ break;
}
+ /* else */
/*
** The arguments are interpreted as file names.
** with a space in it.
*/
writelscmd(buf, sizeof(buf), argp);
- if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
- while (fgets(shell, sizeof (shell), f)
- != NULL) {
+ if ((f = popen_in_dir(cwd, buf, "r"))) {
+ while (fgets(shell, sizeof (shell), f)) {
*(strchr(shell, '\n')) = '\0';
- annotate(drft, attach_hdr, shell,
- 0, 0, 1, 0);
+ snprintf(buf, sizeof buf,
+ "anno -delete -comp "
+ "'%s' -text '%s' '%s'",
+ attach_hdr, shell,
+ drft);
+ if (system(buf) != 0) {
+ advise(NULL, "Could not delete attachment header.");
+ }
}
pclose(f);
} else {
cp = buf + ln;
- while (*++argp != NULL) {
+ while (*++argp) {
ln = strlen(*argp);
/* +1 for leading space */
if (ln + trailln + 1 > bufsz - (cp-buf))
if (reedit) {
if (!*ed) { /* no explicit editor */
*ed = edsave; /* so use the previous one */
- if ((cp = mhbasename(*ed)) == NULL)
+ if (!(cp = mhbasename(*ed)))
cp = *ed;
/* unless we've specified it via "editor-next" */
cp = concat(cp, "-next", NULL);
- if ((cp = context_find(cp)) != NULL)
+ if ((cp = context_find(cp)))
*ed = cp;
}
} else if (!*ed) {
}
if (altmsg) {
- if (mp == NULL || *altmsg == '/' || cwd == NULL)
+ if (!mp || *altmsg == '/' || !cwd)
strncpy(altpath, altmsg, sizeof(altpath));
else
snprintf(altpath, sizeof(altpath), "%s/%s",
mp->foldpath, altmsg);
- if (cwd == NULL)
+ if (!cwd)
strncpy(linkpath, altmsglink, sizeof(linkpath));
else
snprintf(linkpath, sizeof(linkpath), "%s/%s",
cwd, altmsglink);
- }
-
- if (altmsg) {
unlink(linkpath);
#ifdef HAVE_LSTAT
if (link(altpath, linkpath) == NOTOK) {
default:
if ((status = pidwait(pid, NOTOK))) {
- if (((status & 0xff00) != 0xff00)
- && (!reedit || (status & 0x00ff))) {
- if (!use && (status & 0xff00) && (rename(file, cp = m_backup (file)) != NOTOK)) {
+ if (((status & 0xff00) != 0xff00) &&
+ (!reedit || (status & 0x00ff))) {
+ if (!use && (status & 0xff00) && (rename(file, cp = m_backup(file)) != NOTOK)) {
advise(NULL, "problems with edit--draft left in %s", cp);
} else {
advise(NULL, "problems with edit--%s preserved", file);
vec[vecp++] = file;
vec[vecp] = NULL;
- execvp(sendproc, vec);
+ execvp("send", vec);
fprintf(stderr, "unable to exec ");
- perror(sendproc);
+ perror("send");
_exit(-1);
default:
/*
+** refile msg into another folder
+*/
+static int
+refile(char **arg, char *file)
+{
+ pid_t pid;
+ register int vecp;
+ char *vec[MAXARGS];
+
+ vecp = 0;
+ vec[vecp++] = "refile";
+ vec[vecp++] = "-nolink"; /* override bad .mh_profile defaults */
+ vec[vecp++] = "-file";
+ vec[vecp++] = file;
+
+ while (arg && *arg) {
+ vec[vecp++] = *arg++;
+ }
+ vec[vecp] = NULL;
+
+ context_save(); /* save the context file */
+ fflush(stdout);
+
+ switch (pid = fork()) {
+ case -1:
+ advise("fork", "unable to");
+ return -1;
+
+ case 0:
+ execvp(*vec, vec);
+ fprintf(stderr, "unable to exec ");
+ perror(*vec);
+ _exit(-1);
+
+ default:
+ return (pidwait(pid, -1));
+ }
+}
+
+
+/*
** Remove the draft file
*/
projects / mmh / blobdiff