projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send,spost: No more use of -alias, spost reads Aliasfile from the profile.
[mmh]
/
uip
/
send.c
diff --git
a/uip/send.c
b/uip/send.c
index
6be46db
..
5e1f0a1
100644
(file)
--- a/
uip/send.c
+++ b/
uip/send.c
@@
-22,7
+22,6
@@
#include <time.h>
int debugsw = 0; /* global */
#include <time.h>
int debugsw = 0; /* global */
-int verbsw = 0;
char *altmsg = NULL;
char *annotext = NULL;
char *distfile = NULL;
char *altmsg = NULL;
char *annotext = NULL;
char *distfile = NULL;
@@
-53,21
+52,15
@@
static void make_mime_composition_file_entry(char *);
static struct swit switches[] = {
static struct swit switches[] = {
-#define ALIASW 0
- { "alias aliasfile", 0 },
-#define DEBUGSW 1
+#define DEBUGSW 0
{ "debug", -5 },
{ "debug", -5 },
-#define VERBSW 2
+#define VERBSW 1
{ "verbose", 0 },
{ "verbose", 0 },
-#define NVERBSW 3
- { "noverbose", 0 },
-#define WATCSW 4
- { "watch", 0 },
-#define NWATCSW 5
- { "nowatch", 0 },
-#define VERSIONSW 6
- { "version", 0 },
-#define HELPSW 7
+#define NVERBSW 2
+ { "noverbose", 2 },
+#define VERSIONSW 3
+ { "Version", 0 },
+#define HELPSW 4
{ "help", 0 },
{ NULL, 0 }
};
{ "help", 0 },
{ NULL, 0 }
};
@@
-81,17
+74,14
@@
main(int argc, char **argv)
int in, out;
int n;
char *cp, *maildir = NULL;
int in, out;
int n;
char *cp, *maildir = NULL;
- char buf[BUFSIZ], **ap, **argp, **arguments;
+ char buf[BUFSIZ], **argp, **arguments;
char *msgs[MAXARGS], *vec[MAXARGS];
char *files[MAXARGS];
struct msgs *mp;
struct stat st;
struct stat st2;
char *msgs[MAXARGS], *vec[MAXARGS];
char *files[MAXARGS];
struct msgs *mp;
struct stat st;
struct stat st2;
-
-#ifdef LOCALE
setlocale(LC_ALL, "");
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
invo_name = mhbasename(argv[0]);
/* read user profile/context */
@@
-100,9
+90,6
@@
main(int argc, char **argv)
arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
- vec[vecp++] = "-library";
- vec[vecp++] = getcpy(toabsdir("+"));
-
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch(++cp, switches)) {
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch(++cp, switches)) {
@@
-122,31
+109,13
@@
main(int argc, char **argv)
print_version(invo_name);
done(1);
print_version(invo_name);
done(1);
+ case DEBUGSW:
+ debugsw++;
+ /* fall */
case VERBSW:
case VERBSW:
- verbsw++;
- vec[vecp++] = --cp;
- continue;
case NVERBSW:
case NVERBSW:
- verbsw = 0;
- vec[vecp++] = --cp;
- continue;
-
- case DEBUGSW:
- debugsw++; /* fall */
- case WATCSW:
- case NWATCSW:
vec[vecp++] = --cp;
continue;
vec[vecp++] = --cp;
continue;
-
- case ALIASW:
- vec[vecp++] = --cp;
- if (!(cp = *argp++) || *cp == '-') {
- adios(NULL, "missing argument to %s",
- argp[-2]);
- }
- vec[vecp++] = cp;
- continue;
-
}
} else {
if (*cp == '/') {
}
} else {
if (*cp == '/') {
@@
-157,16
+126,6
@@
main(int argc, char **argv)
}
}
}
}
- /* check for "Aliasfile:" profile entry */
- if ((cp = context_find("Aliasfile"))) {
- char *dp = NULL;
-
- for (ap=brkstring(dp=getcpy(cp), " ", "\n"); ap && *ap; ap++) {
- vec[vecp++] = "-alias";
- vec[vecp++] = getcpy(etcpath(*ap));
- }
- }
-
if (!msgp && !nfiles) {
msgs[msgp++] = seq_cur;
}
if (!msgp && !nfiles) {
msgs[msgp++] = seq_cur;
}