X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fwhatnow.c;h=6e58052b88991053cdb94eaa557ce1a98a55b1ab;hp=5b59c86caa23ad74ac56f9a3c9502ea5feb05ef3;hb=8edc5aaf86f9f77124664f6801bc6c6cdf258173;hpb=c8195849d2e366c569271abb0f5f60f4ebf0b4d0 diff --git a/uip/whatnow.c b/uip/whatnow.c index 5b59c86..6e58052 100644 --- a/uip/whatnow.c +++ b/uip/whatnow.c @@ -28,9 +28,8 @@ ** 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 @@ -66,9 +65,9 @@ static struct swit aleqs[] = { #define REFILEOPT 1 { "refile [] +folder", 0 }, #define DISPSW 2 - { "display []", 0 }, + { "display", 0 }, #define LISTSW 3 - { "list []", 0 }, + { "list", 0 }, #define SENDSW 4 { "send []", 0 }, #define PUSHSW 5 @@ -86,9 +85,9 @@ static struct swit aleqs[] = { #define ATTACHCMDSW 11 { "attach", 0 }, #define DETACHCMDSW 12 - { "detach [-n]", 2 }, + { "detach [-n]", 0 }, #define ALISTCMDSW 13 - { "alist [-ln] ", 2 }, + { "alist", 0 }, { NULL, 0 } }; @@ -125,8 +124,7 @@ main(int argc, char **argv) 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, ""); @@ -144,7 +142,7 @@ main(int argc, char **argv) ** Get the initial current working directory. */ - if (getcwd(cwd, sizeof (cwd)) == NULL) { + if (!getcwd(cwd, sizeof (cwd))) { adios("getcwd", "could not get working directory"); } @@ -191,7 +189,7 @@ main(int argc, char **argv) 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; @@ -199,7 +197,7 @@ main(int argc, char **argv) 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++; } @@ -218,10 +216,13 @@ main(int argc, char **argv) switch (smatch(*argp, aleqs)) { case DISPSW: /* display the msg being replied to or distributed */ - if (msgnam) - showfile(++argp, msgnam); - else + if (msgnam) { + snprintf(buf, sizeof buf, "%s '%s'", + listproc, msgnam); + system(buf); + } else { advise(NULL, "no alternate message to display"); + } break; case EDITSW: @@ -235,7 +236,8 @@ main(int argc, char **argv) case LISTSW: /* display the draft file */ - showfile(++argp, drft); + snprintf(buf, sizeof buf, "%s '%s'", listproc, drft); + system(buf); break; case QUITSW: @@ -282,11 +284,11 @@ main(int argc, char **argv) } 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 { @@ -315,38 +317,14 @@ main(int argc, char **argv) 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: @@ -376,21 +354,26 @@ main(int argc, char **argv) ** 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); + sprintf(file, "%s", shell); else { sprintf(file, "%s/%s", cwd, shell); - annotate(drft, attach_hdr, - file, 0, - -2, 1); + } + 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."); } } @@ -409,7 +392,6 @@ main(int argc, char **argv) ** 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++) { @@ -426,21 +408,23 @@ main(int argc, char **argv) ** 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); + 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 = ""; @@ -450,7 +434,9 @@ main(int argc, char **argv) } } } + break; } + /* else */ /* ** The arguments are interpreted as file names. @@ -465,12 +451,17 @@ main(int argc, char **argv) ** 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); + 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 { @@ -521,7 +512,7 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp) cp = buf + ln; - while (*++argp != NULL) { + while (*++argp) { ln = strlen(*argp); /* +1 for leading space */ if (ln + trailln + 1 > bufsz - (cp-buf)) @@ -610,34 +601,30 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp, 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 { + } else if (!*ed) { /* set initial editor */ - if (*ed == NULL && (*ed = context_find("editor")) == NULL) - *ed = defaulteditor; + *ed = defaulteditor; } 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) { @@ -684,9 +671,9 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp, 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); @@ -766,15 +753,13 @@ static int sendfile(char **arg, char *file, int pushsw) { pid_t child_id; - int i, vecp; + int vecp; char *vec[MAXARGS]; context_save(); /* save the context file */ fflush(stdout); - for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) - sleep(5); - switch (child_id) { + switch (child_id = fork()) { case NOTOK: advise(NULL, "unable to fork, so sending directly..."); /* fall */ @@ -789,9 +774,9 @@ sendfile(char **arg, char *file, int pushsw) vec[vecp++] = file; vec[vecp] = NULL; - execvp(sendproc, vec); + execvp("send", vec); fprintf(stderr, "unable to exec "); - perror(sendproc); + perror("send"); _exit(-1); default: