Removed the -[no]watch flags of send and post.

Without direct SMTP delivery, they are useless.

diff --git a/man/send.man1 b/man/send.man1
index 22c37fc..cbbf118 100644 (file)
--- a/man/send.man1
+++ b/man/send.man1
@@ -11,7 +11,6 @@ send \- send a message
 .RB [ \-alias
 .IR aliasfile ]
 .RB [ \-verbose " | " \-noverbose ]
 .RB [ \-alias
 .IR aliasfile ]
 .RB [ \-verbose " | " \-noverbose ]

-.RB [ \-watch " | " \-nowatch ]

 .RB [ msg
 \&...]
 .RB [ \-Version ]
 .RB [ msg
 \&...]
 .RB [ \-Version ]

@@ -70,16 +69,7 @@ If
 .B \-verbose
 is specified,
 .B send
 .B \-verbose
 is specified,
 .B send

-will indicate the interactions
-occurring with the transport system, prior to actual delivery.
-If
-.B \-watch
-is specified
-.B send
-will monitor the delivery of local
-and network mail.  Hence, by specifying both switches, a large detail
-of information can be gathered about each step of the message's entry
-into the transport system.
+will request verbose information of the transport system.

 .PP
 .B Send
 with no
 .PP
 .B Send
 with no

@@ -190,14 +180,10 @@ comp(1), dist(1), forw(1), repl(1), mh\-alias(5), spost(8)
 .nf
 .RB ` msg "' defaults to the current message in the draft folder"
 .RB ` \-noverbose '
 .nf
 .RB ` msg "' defaults to the current message in the draft folder"
 .RB ` \-noverbose '

-.RB ` \-nowatch '

 .fi
 
 .SH CONTEXT
 None
 
 .SH BUGS
 .fi
 
 .SH CONTEXT
 None
 
 .SH BUGS

-Under some configurations, it is not possible to monitor the mail delivery
-transaction;
-.B \-watch
-is a no-op on those systems.
+None

diff --git a/man/spost.man8 b/man/spost.man8
index 849d42b..fda53f4 100644 (file)
--- a/man/spost.man8
+++ b/man/spost.man8
@@ -13,7 +13,6 @@ spost \- feed a message to sendmail
 .IR aliasfile
 .RB " | " \-noalias ]
 .RB [ \-verbose " | " \-noverbose ]
 .IR aliasfile
 .RB " | " \-noalias ]
 .RB [ \-verbose " | " \-noverbose ]

-.RB [ \-watch " | " \-nowatch ]

 .I file
 .RB [ \-Version ]
 .RB [ \-help ]
 .I file
 .RB [ \-Version ]
 .RB [ \-help ]

@@ -69,12 +68,8 @@ read first.
 .PP
 The
 .B \-verbose
 .PP
 The
 .B \-verbose

-enables the output of informational messages.
-This option sets \-watch, too.
-.PP
-The
-.B \-watch
-switch adds the `\-v' switch to the
+switch enables informational messages.
+For example, the `\-v' switch will be added to the

 .B sendmail
 invocation.
 .PP
 .B sendmail
 invocation.
 .PP

@@ -127,7 +122,6 @@ send(1), mh\-mail(5), mh\-alias(5), mh\-tailor(5), refile(1),
 .SH DEFAULTS
 .nf
 .RB ` \-noverbose '
 .SH DEFAULTS
 .nf
 .RB ` \-noverbose '

-.RB ` \-nowatch '

 .fi
 
 .SH CONTEXT
 .fi
 
 .SH CONTEXT

diff --git a/uip/send.c b/uip/send.c
index bcbd54d..c454f76 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;

@@ -61,13 +60,9 @@ static struct swit switches[] = {
        { "verbose", 0 },
 #define NVERBSW  3
        { "noverbose", 2 },
        { "verbose", 0 },
 #define NVERBSW  3
        { "noverbose", 2 },

-#define WATCSW  4
-       { "watch", 0 },
-#define NWATCSW  5
-       { "nowatch", 2 },
-#define VERSIONSW  6
+#define VERSIONSW  4

        { "Version", 0 },
        { "Version", 0 },

-#define HELPSW  7
+#define HELPSW  5

        { "help", 0 },
        { NULL, 0 }
 };
        { "help", 0 },
        { NULL, 0 }
 };

@@ -119,19 +114,11 @@ 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;
 

diff --git a/uip/spost.c b/uip/spost.c
index 30e283f..ff1e80a 100644 (file)
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -24,23 +24,19 @@ static struct swit switches[] = {
        { "verbose", 0 },
 #define NVERBSW  1
        { "noverbose", 2 },
        { "verbose", 0 },
 #define NVERBSW  1
        { "noverbose", 2 },

-#define WATCSW  2
-       { "watch", 0 },
-#define NWATCSW  3
-       { "nowatch", 2 },
-#define ALIASW  4
+#define ALIASW  2

        { "alias aliasfile", 0 },
        { "alias aliasfile", 0 },

-#define NALIASW  5
+#define NALIASW  3

        { "noalias", 2 },
        { "noalias", 2 },

-#define VERSIONSW  6
+#define VERSIONSW  4

        { "Version", 0 },
        { "Version", 0 },

-#define HELPSW  7
+#define HELPSW  5

        { "help", 0 },
        { "help", 0 },

-#define DEBUGSW  8
+#define DEBUGSW  6

        { "debug", -5 },
        { "debug", -5 },

-#define DISTSW  9
+#define DISTSW  7

        { "dist", -4 },  /* interface from dist */
        { "dist", -4 },  /* interface from dist */

-#define LIBSW  10
+#define LIBSW  8

        { "library directory", -7 },
        { NULL, 0 }
 };
        { "library directory", -7 },
        { NULL, 0 }
 };

@@ -105,10 +101,9 @@ static struct headers RHeaders[] = {
 };
 
 
 };
 
 

-static int badmsg = 0;  /* message has bad semantics */
-static int verbose = 0;  /* spell it out */
-static int debug = 0;  /* debugging post */
-static int watch = 0;  /* watch the delivery process */
+static int badmsg = 0;
+static int verbose = 0;
+static int debug = 0;

 static int aliasflg = 0;  /* if going to process aliases */
 
 static unsigned msgflags = 0;  /* what we've seen */
 static int aliasflg = 0;  /* if going to process aliases */
 
 static unsigned msgflags = 0;  /* what we've seen */

@@ -191,13 +186,6 @@ main(int argc, char **argv)
                                verbose = 0;
                                continue;
 
                                verbose = 0;
                                continue;
 

-                       case WATCSW:
-                               watch++;
-                               continue;
-                       case NWATCSW:
-                               watch = 0;
-                               continue;
-

                        case ALIASW:
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",
                        case ALIASW:
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",

@@ -321,7 +309,7 @@ main(int argc, char **argv)
        *argp++ = "-m";  /* send to me too */
        *argp++ = "-t";  /* read msg for recipients */
        *argp++ = "-i";  /* don't stop on "." */
        *argp++ = "-m";  /* send to me too */
        *argp++ = "-t";  /* read msg for recipients */
        *argp++ = "-i";  /* don't stop on "." */

-       if (watch || verbose) {
+       if (verbose) {

                *argp++ = "-v";
        }
        *argp = NULL;
                *argp++ = "-v";
        }
        *argp = NULL;