projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Alias: Removed the address group `*', which meant everyone on the system.
[mmh]
/
uip
/
spost.c
diff --git
a/uip/spost.c
b/uip/spost.c
index
8c55c06
..
f2552dc
100644
(file)
--- a/
uip/spost.c
+++ b/
uip/spost.c
@@
-50,24
+50,20
@@
struct swit switches[] = {
{ "alias aliasfile", 0 },
#define NALIASW 13
{ "noalias", 0 },
{ "alias aliasfile", 0 },
#define NALIASW 13
{ "noalias", 0 },
-#define WIDTHSW 14
- { "width columns", 0 },
-#define VERSIONSW 15
+#define VERSIONSW 14
{ "version", 0 },
{ "version", 0 },
-#define HELPSW 16
+#define HELPSW 15
{ "help", 0 },
{ "help", 0 },
-#define DEBUGSW 17
+#define DEBUGSW 16
{ "debug", -5 },
{ "debug", -5 },
-#define DISTSW 18
+#define DISTSW 17
{ "dist", -4 }, /* interface from dist */
{ "dist", -4 }, /* interface from dist */
-#define PUSHSW 19 /* fork to sendmail then exit */
+#define PUSHSW 18 /* fork to sendmail then exit */
{ "push", -4 },
{ "push", -4 },
-#define NPUSHSW 20 /* exec sendmail */
+#define NPUSHSW 19 /* exec sendmail */
{ "nopush", -6 },
{ "nopush", -6 },
-#define LIBSW 21
+#define LIBSW 20
{ "library directory", -7 },
{ "library directory", -7 },
-#define ANNOSW 22
- { "idanno number", -6 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-143,7
+139,6
@@
static int watch = 0; /* watch the delivery process */
static int backflg = 0; /* rename input file as *.bak when done */
static int pushflg = 0; /* if going to fork to sendmail */
static int aliasflg = 0; /* if going to process aliases */
static int backflg = 0; /* rename input file as *.bak when done */
static int pushflg = 0; /* if going to fork to sendmail */
static int aliasflg = 0; /* if going to process aliases */
-static int outputlinelen=72;
static unsigned msgflags = 0; /* what we've seen */
static unsigned msgflags = 0; /* what we've seen */
@@
-295,15
+290,6
@@
main(int argc, char **argv)
aliasflg = 0;
continue;
aliasflg = 0;
continue;
- case WIDTHSW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- outputlinelen = atoi(cp);
- if (outputlinelen <= 10)
- outputlinelen = 72;
- continue;
-
case LIBSW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
case LIBSW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
@@
-312,13
+298,6
@@
main(int argc, char **argv)
if (context_foil(cp) == -1)
done(1);
continue;
if (context_foil(cp) == -1)
done(1);
continue;
-
- case ANNOSW:
- /* -idanno switch ignored */
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- continue;
}
}
if (msg)
}
}
if (msg)
@@
-713,7
+692,7
@@
putone(char *adr, int pos, int indent)
len = strlen( adr );
if (pos == indent)
linepos = pos;
len = strlen( adr );
if (pos == indent)
linepos = pos;
- else if (linepos+len > outputlinelen) {
+ else if (linepos+len > OUTPUTLINELEN) {
fprintf( out, ",\n%*s", indent, "");
linepos = indent;
pos += indent + 2;
fprintf( out, ",\n%*s", indent, "");
linepos = indent;
pos += indent + 2;