X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8cebca1119664be52f1cbccd0ee052ae0b8c1de0..be6c3984:/uip/whatnowsbr.c?ds=inline diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index 7f5c6c3c..f0f9a2c5 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -53,8 +53,9 @@ X("prompt string", 4, PRMPTSW) \ X("version", 0, VERSIONSW) \ X("help", 0, HELPSW) \ - X("attach header-field-name", 0, ATTACHSW) \ - X("noattach", 0, NOATTACHSW) \ + X("attach header-field-name", -6, ATTACHSW) \ + X("noattach", -8, NOATTACHSW) \ + #define X(sw, minchars, id) id, DEFINE_SWITCH_ENUM(WHATNOW); @@ -103,7 +104,6 @@ static int editfile (char **, char **, char *, int, struct msgs *, static int sendfile (char **, char *, int); static void sendit (char *, char **, char *, int); static int buildfile (char **, char *); -static int check_draft (char *); static int whomfile (char **, char *); static int removefile (char *); static void writelscmd(char *, int, char *, char **); @@ -122,7 +122,6 @@ WhatNow (int argc, char **argv) char buf[BUFSIZ], prompt[BUFSIZ]; char **argp, **arguments; struct stat st; - char *attach = NMH_ATTACH_HEADER;/* attachment header field name */ char cwd[PATH_MAX + 1]; /* current working directory */ char file[PATH_MAX + 1]; /* file name buffer */ char shell[PATH_MAX + 1]; /* shell response buffer */ @@ -130,6 +129,9 @@ WhatNow (int argc, char **argv) char *l; /* set on -l to alist command */ int n; /* set on -n to alist command */ + /* Need this if called from what_now(). */ + invo_name = r1bindex (argv[0], '/'); + arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; @@ -192,12 +194,11 @@ WhatNow (int argc, char **argv) continue; case ATTACHSW: - if (!(attach = *argp++) || *attach == '-') - adios (NULL, "missing argument to %s", argp[-2]); + advise(NULL, "The -attach switch is deprecated"); continue; case NOATTACHSW: - attach = NULL; + advise(NULL, "The -noattach switch is deprecated"); continue; } } @@ -355,11 +356,6 @@ WhatNow (int argc, char **argv) * -n numbers listing */ - if (attach == (char *)0) { - advise((char *)0, "can't list because no header field name was given."); - break; - } - l = (char *)0; n = 0; @@ -385,7 +381,7 @@ WhatNow (int argc, char **argv) advise((char *)0, "usage is alist [-ln]."); else - annolist(drft, attach, l, n); + annolist(drft, ATTACH_FIELD, l, n); break; @@ -397,11 +393,6 @@ WhatNow (int argc, char **argv) int verbose = 0; char **ap; - if (attach == (char *)0) { - advise((char *)0, "can't attach because no header field name was given."); - break; - } - for (ap = argp+1; *ap; ++ap) { if (strcmp(*ap, "-v") == 0) { ++argp; @@ -432,28 +423,25 @@ WhatNow (int argc, char **argv) if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) { while (fgets(shell, sizeof (shell), f) != (char *)0) { - char *build_directive; + char *ctype; *(strchr(shell, '\n')) = '\0'; if (*shell == '/') { - (void)annotate(drft, attach, shell, 1, 0, -2, 1); - if (verbose) { - build_directive = - construct_build_directive (shell, NULL, 1); - } + strncpy(file, shell, sizeof(file)); + file[sizeof(file) - 1] = '\0'; } else { - (void)sprintf(file, "%s/%s", cwd, shell); - (void)annotate(drft, attach, file, 1, 0, -2, 1); - if (verbose) { - build_directive = - construct_build_directive (file, NULL, 1); - } + snprintf(file, sizeof(file), "%s/%s", cwd, shell); } + annotate(drft, ATTACH_FIELD, file, 1, 0, -2, 1); if (verbose) { - printf ("%s", build_directive); - free (build_directive); + ctype = mime_type(file); + } + + if (verbose) { + printf ("Attaching %s as a %s\n", file, ctype); + free (ctype); } } @@ -470,11 +458,6 @@ WhatNow (int argc, char **argv) * Detach files from current draft. */ - if (attach == (char *)0) { - advise((char *)0, "can't detach because no header field name was given."); - break; - } - /* * Scan the arguments for a -n. Mixed file names and numbers aren't allowed, * so this catches a -n anywhere in the argument list. @@ -501,7 +484,7 @@ WhatNow (int argc, char **argv) if (**arguments != '\0') { n = atoi(*arguments); - (void)annotate(drft, attach, (char *)0, 1, 0, n, 1); + annotate(drft, ATTACH_FIELD, (char *)0, 1, 0, n, 1); for (argp = arguments + 1; *argp != (char *)0; argp++) { if (atoi(*argp) > n) { @@ -528,7 +511,7 @@ WhatNow (int argc, char **argv) if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) { while (fgets(shell, sizeof (shell), f) != (char *)0) { *(strchr(shell, '\n')) = '\0'; - (void)annotate(drft, attach, shell, 1, 0, 0, 1); + annotate(drft, ATTACH_FIELD, shell, 1, 0, 0, 1); } pclose(f); } else { @@ -817,19 +800,6 @@ sendfile (char **arg, char *file, int pushsw) int i, vecp; char *cp, *sp, **vec, *program; - /* Translate MIME composition file, if necessary */ - if ((cp = context_find ("automimeproc")) - && (!strcmp (cp, "1")) - && check_draft (file) - && (buildfile (NULL, file) == NOTOK)) - return 0; - - /* For backwards compatibility */ - if ((cp = context_find ("automhnproc")) - && check_draft (file) - && (i = editfile (&cp, NULL, file, NOUSE, NULL, NULL, NULL, 0, 0))) - return 0; - /* * If the sendproc is the nmh command `send', then we call * those routines directly rather than exec'ing the command. @@ -912,66 +882,6 @@ buildfile (char **argp, char *file) } -/* - * Check if draft is a mhbuild composition file - */ - -static int -check_draft (char *msgnam) -{ - int state; - char buf[BUFSIZ], name[NAMESZ]; - FILE *fp; - m_getfld_state_t gstate = 0; - - if ((fp = fopen (msgnam, "r")) == NULL) - return 0; - for (;;) { - int bufsz = sizeof buf; - switch (state = m_getfld (&gstate, name, buf, &bufsz, fp)) { - case FLD: - case FLDPLUS: - /* - * If draft already contains any of the - * Content-XXX fields, then assume it already - * been converted. - */ - if (uprf (name, XXX_FIELD_PRF)) { - fclose (fp); - m_getfld_state_destroy (&gstate); - return 0; - } - while (state == FLDPLUS) { - bufsz = sizeof buf; - state = m_getfld (&gstate, name, buf, &bufsz, fp); - } - break; - - case BODY: - do { - char *bp; - - for (bp = buf; *bp; bp++) - if (*bp != ' ' && *bp != '\t' && *bp != '\n') { - fclose (fp); - m_getfld_state_destroy (&gstate); - return 1; - } - - bufsz = sizeof buf; - state = m_getfld (&gstate, name, buf, &bufsz, fp); - } while (state == BODY); - /* and fall... */ - - default: - fclose (fp); - m_getfld_state_destroy (&gstate); - return 0; - } - } -} - - #ifndef CYRUS_SASL # define SASLminc(a) (a) #else /* CYRUS_SASL */ @@ -1061,9 +971,6 @@ sendit (char *sp, char **arg, char *file, int pushed) char *cp, buf[BUFSIZ], **argp, *program; char **arguments, *savearg[MAXARGS], **vec; struct stat st; - char *attach = NMH_ATTACH_HEADER;/* attachment header field name */ - int attachformat = 1; /* mhbuild format specifier for - attachments */ #ifndef lint int distsw = 0; @@ -1241,28 +1148,14 @@ sendit (char *sp, char **arg, char *file, int pushed) continue; case SNDATTACHSW: - if (!(attach = *argp++) || *attach == '-') { - advise (NULL, "missing argument to %s", argp[-2]); - return; - } + advise(NULL, "The -attach switch is deprecated"); continue; case SNDNOATTACHSW: - attach = NULL; + advise(NULL, "The -noattach switch is deprecated"); continue; case SNDATTACHFORMAT: - if (! *argp || **argp == '-') - adios (NULL, "missing argument to %s", argp[-1]); - else { - attachformat = atoi (*argp); - if (attachformat < 0 || - attachformat > ATTACHFORMATS - 1) { - advise (NULL, "unsupported attachformat %d", - attachformat); - continue; - } - } - ++argp; + advise(NULL, "The -attachformat switch is deprecated"); continue; } } @@ -1321,7 +1214,7 @@ sendit (char *sp, char **arg, char *file, int pushed) closefds (3); - if (sendsbr (vec, vecp, program, file, &st, 1, attach, attachformat) == OK) + if (sendsbr (vec, vecp, program, file, &st, 1) == OK) done (0); }