projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When Shantonu made the new libmts.a, he swapped $(MTSLIB) and libmh.a in
[mmh]
/
uip
/
mshcmds.c
diff --git
a/uip/mshcmds.c
b/uip/mshcmds.c
index
fcdd5e1
..
b8c7d92
100644
(file)
--- a/
uip/mshcmds.c
+++ b/
uip/mshcmds.c
@@
-10,8
+10,8
@@
#include <h/dropsbr.h>
#include <h/fmt_scan.h>
#include <h/scansbr.h>
#include <h/dropsbr.h>
#include <h/fmt_scan.h>
#include <h/scansbr.h>
-#include <zotnet/tws/tws.h>
-#include <zotnet/mts/mts.h>
+#include <h/tws.h>
+#include <mts/generic/mts.h>
#include <errno.h>
#include <setjmp.h>
#include <signal.h>
#include <errno.h>
#include <setjmp.h>
#include <signal.h>
@@
-68,6
+68,8
@@
static int process (int, char *, int, char **);
static void copy_message (int, FILE *);
static void copy_digest (int, FILE *);
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)
void
forkcmd (char **args, char *pgm)
@@
-137,7
+139,7
@@
static struct swit distswit[] = {
#define DINWTSW 11
{ "nowhatnowproc", 0 },
#define DIHELP 12
#define DINWTSW 11
{ "nowhatnowproc", 0 },
#define DIHELP 12
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-238,7
+240,7
@@
static struct swit explswit[] = {
#define EXNVBSW 5
{ "noverbose", 0 },
#define EXHELP 6
#define EXNVBSW 5
{ "noverbose", 0 },
#define EXHELP 6
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-467,7
+469,7
@@
static struct swit fileswit[] = {
#define FINPRC 8
{ "normmproc", 0 },
#define FIHELP 9
#define FINPRC 8
{ "normmproc", 0 },
#define FIHELP 9
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-631,7
+633,7
@@
static struct swit foldswit[] = {
#define FLLISW 14
{ "list", 0 },
#define FLHELP 15
#define FLLISW 14
{ "list", 0 },
#define FLHELP 15
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-691,7
+693,7
@@
foldcmd (char **args)
packsw = 0;
continue;
}
packsw = 0;
continue;
}
- if (*cp == '+' || *cp == '@')
+ if (*cp == '+' || *cp == '@') {
if (folder) {
advise (NULL, "only one folder at a time!\n");
return;
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
folder = fmsh ? path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF)
: cp + 1;
+ }
else
if (msg) {
advise (NULL, "only one message at a time!\n");
else
if (msg) {
advise (NULL, "only one message at a time!\n");
@@
-849,7
+852,7
@@
static struct swit forwswit[] = {
#define FONWTSW 16
{ "nowhatnow", 0 },
#define FOHELP 17
#define FONWTSW 16
{ "nowhatnow", 0 },
#define FOHELP 17
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-932,7
+935,16
@@
forwcmd (char **args)
/* foil search of .mh_profile */
snprintf (buf, sizeof(buf), "%sXXXXXX", invo_name);
/* 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);
vec[0] = (char *)mktemp (buf);
+/*
+#endif
+*/
vec[vecp++] = "-file";
vec[vecp] = NULL;
if (!msgp)
vec[vecp++] = "-file";
vec[vecp] = NULL;
if (!msgp)
@@
-1108,7
+1120,7
@@
static struct swit markswit[] = {
#define MNZERSW 7
{ "nozero", 0 },
#define MHELP 8
#define MNZERSW 7
{ "nozero", 0 },
#define MHELP 8
- { "help", 4 },
+ { "help", 0 },
#define MDBUGSW 9
{ "debug", -5 },
{ NULL, 0 }
#define MDBUGSW 9
{ "debug", -5 },
{ NULL, 0 }
@@
-1188,7
+1200,7
@@
markcmd (char **args)
}
}
}
}
- if (!addsw && !deletesw && !listsw)
+ if (!addsw && !deletesw && !listsw) {
if (seqp)
addsw++;
else
if (seqp)
addsw++;
else
@@
-1201,6
+1213,7
@@
markcmd (char **args)
if (!msgp)
msgs[msgp++] = "all";
}
if (!msgp)
msgs[msgp++] = "all";
}
+ }
if (!msgp)
msgs[msgp++] = listsw ? "all" :"cur";
if (!msgp)
msgs[msgp++] = listsw ? "all" :"cur";
@@
-1326,7
+1339,7
@@
static struct swit mhnswit[] = {
#define MHNNVERBSW 23
{ "noverbose", 0 },
#define MHNHELPSW 24
#define MHNNVERBSW 23
{ "noverbose", 0 },
#define MHNHELPSW 24
- { "help", 4 },
+ { "help", 0 },
#define MHNPROGSW 25
{ "moreproc program", -4 },
#define MHNNPROGSW 26
#define MHNPROGSW 25
{ "moreproc program", -4 },
#define MHNNPROGSW 26
@@
-1441,11
+1454,11
@@
static struct swit packswit[] = {
#define PAFISW 0
{ "file name", 0 },
#define PAHELP 1
#define PAFISW 0
{ "file name", 0 },
#define PAHELP 1
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
-static mbx_style = MMDF_FORMAT;
+static int mbx_style = MMDF_FORMAT;
void
packcmd (char **args)
void
packcmd (char **args)
@@
-1619,7
+1632,7
@@
static struct swit pickswit[] = {
#define PINLISW 21
{ "nolist", 0 },
#define PIHELP 22
#define PINLISW 21
{ "nolist", 0 },
#define PIHELP 22
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-1806,7
+1819,7
@@
static struct swit replswit[] = {
#define REWIDSW 19
{ "width columns", 0 },
#define REHELP 20
#define REWIDSW 19
{ "width columns", 0 },
#define REHELP 20
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-1902,7
+1915,7
@@
replcmd (char **args)
static struct swit rmmswit[] = {
#define RMHELP 0
static struct swit rmmswit[] = {
#define RMHELP 0
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-2031,7
+2044,7
@@
static struct swit scanswit[] = {
#define SCWID 6
{ "width columns", 0 },
#define SCHELP 7
#define SCWID 6
{ "width columns", 0 },
#define SCHELP 7
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-2281,7
+2294,7
@@
static struct swit showswit[] = {
#define SHNHEAD 9
{ "noheader", 3 },
#define SHHELP 10
#define SHNHEAD 9
{ "noheader", 3 },
#define SHHELP 10
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-2374,7
+2387,6
@@
showcmd (char **args)
for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
if (is_selected (mp, msgnum) && is_nontext (msgnum)) {
proc = showmimeproc;
for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
if (is_selected (mp, msgnum) && is_nontext (msgnum)) {
proc = showmimeproc;
- vec[vecp++] = "-show";
vec[vecp++] = "-file";
vec[vecp] = NULL;
goto finish;
vec[vecp++] = "-file";
vec[vecp] = NULL;
goto finish;
@@
-2713,7
+2725,7
@@
static struct swit sortswit[] = {
#define SONVERB 6
{ "noverbose", 0 },
#define SOHELP 7
#define SONVERB 6
{ "noverbose", 0 },
#define SOHELP 7
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};