projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed the -nomoreproc switch from mhl, show, mhshow.
[mmh]
/
uip
/
scan.c
diff --git
a/uip/scan.c
b/uip/scan.c
index
e5fb55a
..
d5cc50f
100644
(file)
--- a/
uip/scan.c
+++ b/
uip/scan.c
@@
-10,50
+10,32
@@
#include <h/fmt_scan.h>
#include <h/scansbr.h>
#include <h/tws.h>
#include <h/fmt_scan.h>
#include <h/scansbr.h>
#include <h/tws.h>
-#include <h/mts.h>
#include <h/utils.h>
#include <errno.h>
static struct swit switches[] = {
#include <h/utils.h>
#include <errno.h>
static struct swit switches[] = {
-#define CLRSW 0
- { "clear", 0 },
-#define NCLRSW 1
- { "noclear", 0 },
-#define FORMSW 2
+#define FORMSW 0
{ "form formatfile", 0 },
{ "form formatfile", 0 },
-#define FMTSW 3
- { "format string", 5 },
-#define WIDTHSW 4
+#define WIDTHSW 1
{ "width columns", 0 },
{ "width columns", 0 },
-#define REVSW 5
- { "reverse", 0 },
-#define NREVSW 6
- { "noreverse", 0 },
-#define FILESW 7
+#define FILESW 2
{ "file file", 4 },
{ "file file", 4 },
-#define VERSIONSW 8
+#define VERSIONSW 3
{ "version", 0 },
{ "version", 0 },
-#define HELPSW 9
+#define HELPSW 4
{ "help", 0 },
{ NULL, 0 }
};
{ "help", 0 },
{ NULL, 0 }
};
-/*
-** prototypes
-*/
-void clear_screen(void); /* from termsbr.c */
-
-
int
main(int argc, char **argv)
{
int
main(int argc, char **argv)
{
- int clearflag = 0, ontty;
- int width = 0, revflag = 0;
+ int width = 0;
int i, state, msgnum;
int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
char *cp, *maildir, *file = NULL, *folder = NULL;
int i, state, msgnum;
int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
char *cp, *maildir, *file = NULL, *folder = NULL;
- char *form = NULL, *format = NULL, buf[BUFSIZ];
+ char *form = NULL, buf[BUFSIZ];
char **argp, *nfs, **arguments;
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
char **argp, *nfs, **arguments;
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
@@
-67,7
+49,6
@@
main(int argc, char **argv)
/* read user profile/context */
context_read();
/* read user profile/context */
context_read();
- mts_init(invo_name);
arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
@@
-91,24
+72,10
@@
main(int argc, char **argv)
print_version(invo_name);
done(1);
print_version(invo_name);
done(1);
- case CLRSW:
- clearflag++;
- continue;
- case NCLRSW:
- clearflag = 0;
- continue;
-
case FORMSW:
if (!(form = *argp++) || *form == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
case FORMSW:
if (!(form = *argp++) || *form == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- format = NULL;
- continue;
- case FMTSW:
- if (!(format = *argp++) || *format == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- form = NULL;
continue;
case WIDTHSW:
continue;
case WIDTHSW:
@@
-117,12
+84,6
@@
main(int argc, char **argv)
argp[-2]);
width = atoi(cp);
continue;
argp[-2]);
width = atoi(cp);
continue;
- case REVSW:
- revflag++;
- continue;
- case NREVSW:
- revflag = 0;
- continue;
case FILESW:
if (!(cp = *argp++) || (cp[0] == '-' && cp[1]))
case FILESW:
if (!(cp = *argp++) || (cp[0] == '-' && cp[1]))
@@
-145,7
+106,7
@@
main(int argc, char **argv)
/*
** Get new format string. Must be before chdir().
*/
/*
** Get new format string. Must be before chdir().
*/
- nfs = new_fs(form, format, FORMAT);
+ nfs = new_fs(form, FORMAT);
/*
** We are scanning a maildrop file
/*
** We are scanning a maildrop file
@@
-226,11
+187,7
@@
main(int argc, char **argv)
}
}
}
}
- ontty = isatty(fileno(stdout));
-
- for (msgnum = revflag ? mp->hghsel : mp->lowsel;
- (revflag ? msgnum >= mp->lowsel : msgnum <= mp->hghsel);
- msgnum += (revflag ? -1 : 1)) {
+ for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
if (is_selected(mp, msgnum)) {
if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) {
admonish(cp, "unable to open message");
if (is_selected(mp, msgnum)) {
if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) {
admonish(cp, "unable to open message");
@@
-265,14
+222,10
@@
main(int argc, char **argv)
break;
}
fclose(in);
break;
}
fclose(in);
- if (ontty)
- fflush(stdout);
}
}
folder_free(mp); /* free folder/message structure */
}
}
folder_free(mp); /* free folder/message structure */
- if (clearflag)
- clear_screen();
done(0);
return 1;
done(0);
return 1;