X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmshcmds.c;h=13ad35622c3f5136baa8f6d45efbfbc9f54ae838;hb=7736b0a60c15cc20db0ba8c3e0fe8e11d1c78c20;hp=fcdd5e16507797c0c99398f95fa120c3d631549e;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b;p=mmh diff --git a/uip/mshcmds.c b/uip/mshcmds.c index fcdd5e1..13ad356 100644 --- a/uip/mshcmds.c +++ b/uip/mshcmds.c @@ -68,6 +68,8 @@ static int process (int, char *, int, char **); static void copy_message (int, FILE *); static void copy_digest (int, FILE *); +/* from mhlsbr.c */ +int mhlsbr (int, char **, FILE *(*)()); void forkcmd (char **args, char *pgm) @@ -691,7 +693,7 @@ foldcmd (char **args) packsw = 0; continue; } - if (*cp == '+' || *cp == '@') + if (*cp == '+' || *cp == '@') { if (folder) { advise (NULL, "only one folder at a time!\n"); return; @@ -699,6 +701,7 @@ foldcmd (char **args) else folder = fmsh ? path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF) : cp + 1; + } else if (msg) { advise (NULL, "only one message at a time!\n"); @@ -932,7 +935,16 @@ forwcmd (char **args) /* foil search of .mh_profile */ snprintf (buf, sizeof(buf), "%sXXXXXX", invo_name); +/* + Mkstemp work postponed until later -Doug +#ifdef HAVE_MKSTEMP + vec[0] = (char *)mkstemp (buf); +#else +*/ vec[0] = (char *)mktemp (buf); +/* +#endif +*/ vec[vecp++] = "-file"; vec[vecp] = NULL; if (!msgp) @@ -1188,7 +1200,7 @@ markcmd (char **args) } } - if (!addsw && !deletesw && !listsw) + if (!addsw && !deletesw && !listsw) { if (seqp) addsw++; else @@ -1201,6 +1213,7 @@ markcmd (char **args) if (!msgp) msgs[msgp++] = "all"; } + } if (!msgp) msgs[msgp++] = listsw ? "all" :"cur"; @@ -1445,7 +1458,7 @@ static struct swit packswit[] = { { NULL, 0 } }; -static mbx_style = MMDF_FORMAT; +static int mbx_style = MMDF_FORMAT; void packcmd (char **args)