projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added Content-Description header with the filename of the attachment.
[mmh]
/
uip
/
mhl.c
diff --git
a/uip/mhl.c
b/uip/mhl.c
index
3d8ad8d
..
c1c5355
100644
(file)
--- a/
uip/mhl.c
+++ b/
uip/mhl.c
@@
-45,27
+45,25
@@
static struct swit mhlswitches[] = {
{ "folder +folder", 0 },
#define FORMSW 1
{ "form formfile", 0 },
{ "folder +folder", 0 },
#define FORMSW 1
{ "form formfile", 0 },
-#define PROGSW 2
- { "moreproc program", 0 },
-#define WIDTHSW 3
+#define WIDTHSW 2
{ "width columns", 0 },
{ "width columns", 0 },
-#define SLEEPSW 4
+#define SLEEPSW 3
{ "sleep seconds", 0 },
{ "sleep seconds", 0 },
-#define VERSIONSW 5
+#define VERSIONSW 4
{ "version", 0 },
{ "version", 0 },
-#define HELPSW 6
+#define HELPSW 5
{ "help", 0 },
{ "help", 0 },
-#define FORW1SW 7
+#define FORW1SW 6
{ "forward", -7 },
{ "forward", -7 },
-#define FORW2SW 8
+#define FORW2SW 7
{ "forwall", -7 },
{ "forwall", -7 },
-#define DGSTSW 9
+#define DGSTSW 8
{ "digest list", -6 },
{ "digest list", -6 },
-#define VOLUMSW 10
+#define VOLUMSW 9
{ "volume number", -6 },
{ "volume number", -6 },
-#define ISSUESW 11
+#define ISSUESW 10
{ "issue number", -5 },
{ "issue number", -5 },
-#define NBODYSW 12
+#define NBODYSW 11
{ "nobody", -6 },
{ NULL, 0 }
};
{ "nobody", -6 },
{ NULL, 0 }
};
@@
-252,7
+250,6
@@
main(int argc, char **argv)
char *cp, *folder = NULL, *form = NULL;
char buf[BUFSIZ], *files[MAXARGS];
char **argp, **arguments;
char *cp, *folder = NULL, *form = NULL;
char buf[BUFSIZ], *files[MAXARGS];
char **argp, **arguments;
- char *progsw = NULL;
#ifdef LOCALE
setlocale(LC_ALL, "");
#ifdef LOCALE
setlocale(LC_ALL, "");
@@
-304,12
+301,6
@@
main(int argc, char **argv)
sleepsw = atoi(cp); /* ZERO ok! */
continue;
sleepsw = atoi(cp); /* ZERO ok! */
continue;
- case PROGSW:
- if (!(progsw = *argp++) || *progsw == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- continue;
-
case WIDTHSW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
case WIDTHSW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
@@
-365,7
+356,7
@@
main(int argc, char **argv)
SIGNAL2(SIGQUIT, quitser);
}
SIGNAL2(SIGPIPE, pipeser);
SIGNAL2(SIGQUIT, quitser);
}
SIGNAL2(SIGPIPE, pipeser);
- m_popen(progsw ? progsw : moreproc);
+ m_popen(defaultpager);
ontty = PITTY;
} else {
ontty = NOTTY;
ontty = PITTY;
} else {
ontty = NOTTY;
@@
-416,7
+407,7
@@
static void
mhl_format(char *file, int width)
{
int i;
mhl_format(char *file, int width)
{
int i;
- char *bp, *cp, **ip;
+ char *bp, *cp;
char *ap, buffer[BUFSIZ], name[NAMESZ];
struct mcomp *c1;
struct stat st;
char *ap, buffer[BUFSIZ], name[NAMESZ];
struct mcomp *c1;
struct stat st;
@@
-452,7
+443,7
@@
mhl_format(char *file, int width)
global.c_width = i;
global.c_cwidth = -1;
global.c_flags = 0;
global.c_width = i;
global.c_cwidth = -1;
global.c_flags = 0;
- *(ip = ignores) = NULL;
+ *ignores = NULL;
while (vfgets(fp, &ap) == OK) {
bp = ap;
while (vfgets(fp, &ap) == OK) {
bp = ap;
@@
-479,25
+470,20
@@
mhl_format(char *file, int width)
** it to the end of the current "ignores" list.
*/
if (!mh_strcasecmp(name, "ignores")) {
** it to the end of the current "ignores" list.
*/
if (!mh_strcasecmp(name, "ignores")) {
- char **tmparray, **p;
+ char **tmparray;
int n = 0;
/* split the fields */
tmparray = brkstring(getcpy(++parptr), ",",
NULL);
int n = 0;
/* split the fields */
tmparray = brkstring(getcpy(++parptr), ",",
NULL);
-
- /* count number of fields split */
- p = tmparray;
- while (*p++)
- n++;
-
/*
** copy pointers to split fields
** to ignores array
*/
/*
** copy pointers to split fields
** to ignores array
*/
- ip = copyip(tmparray, ip,
- MAXARGS - num_ignores);
- num_ignores += n;
+ while (tmparray[n] && num_ignores<MAXARGS-1) {
+ ignores[num_ignores++] = tmparray[n++];
+ }
+ ignores[num_ignores] = NULL;
continue;
}
parptr = bp;
continue;
}
parptr = bp;