compare return value from getopt against -1 rather than EOF, per the final

posix standard on the topic.

6 files changed, 8 insertions, 8 deletions

diff --git a/usr.sbin/sendmail/contrib/bitdomain.c b/usr.sbin/sendmail/contrib/bitdomain.c
index 720b9a1..6f1bded 100644
--- a/usr.sbin/sendmail/contrib/bitdomain.c
+++ b/usr.sbin/sendmail/contrib/bitdomain.c
@@ -51,7 +51,7 @@ char **argv;
 {
     int opt;
 
-    while ((opt = getopt(argc, argv, "o:")) != EOF) {
+    while ((opt = getopt(argc, argv, "o:")) != -1) {
 	switch (opt) {
 	case 'o':
 	    if (!freopen(optarg, "w", stdout)) {
diff --git a/usr.sbin/sendmail/mail.local/mail.local.c b/usr.sbin/sendmail/mail.local/mail.local.c
index 9c5300a..a61cde5 100644
--- a/usr.sbin/sendmail/mail.local/mail.local.c
+++ b/usr.sbin/sendmail/mail.local/mail.local.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $Id: mail.local.c,v 1.7 1997/02/22 16:13:23 peter Exp $
  */
 
 #ifndef lint
@@ -215,7 +215,7 @@ main(argc, argv)
 	from = NULL;
 	nobiff = 0;
 	nofsync = 0;
-	while ((ch = getopt(argc, argv, "bdf:r:s")) != EOF)
+	while ((ch = getopt(argc, argv, "bdf:r:s")) != -1)
 		switch(ch) {
 		case 'b':
 			nobiff++;
diff --git a/usr.sbin/sendmail/mailstats/mailstats.c b/usr.sbin/sendmail/mailstats/mailstats.c
index cf11218..3833da3 100644
--- a/usr.sbin/sendmail/mailstats/mailstats.c
+++ b/usr.sbin/sendmail/mailstats/mailstats.c
@@ -73,7 +73,7 @@ main(argc, argv)
 	cfile = _PATH_SENDMAILCF;
 	sfile = NULL;
 	mnames = TRUE;
-	while ((ch = getopt(argc, argv, "C:f:o")) != EOF)
+	while ((ch = getopt(argc, argv, "C:f:o")) != -1)
 	{
 		switch (ch)
 		{
diff --git a/usr.sbin/sendmail/makemap/makemap.c b/usr.sbin/sendmail/makemap/makemap.c
index 2955334..a1e73c4 100644
--- a/usr.sbin/sendmail/makemap/makemap.c
+++ b/usr.sbin/sendmail/makemap/makemap.c
@@ -129,7 +129,7 @@ main(argc, argv)
 #else
 #define OPTIONS		"Ndforv"
 #endif
-	while ((opt = getopt(argc, argv, OPTIONS)) != EOF)
+	while ((opt = getopt(argc, argv, OPTIONS)) != -1)
 	{
 		switch (opt)
 		{
diff --git a/usr.sbin/sendmail/praliases/praliases.c b/usr.sbin/sendmail/praliases/praliases.c
index 24f3185..1177164 100644
--- a/usr.sbin/sendmail/praliases/praliases.c
+++ b/usr.sbin/sendmail/praliases/praliases.c
@@ -69,7 +69,7 @@ main(argc, argv)
 #endif
 
 	filename = "/etc/aliases";
-	while ((ch = getopt(argc, argv, "f:")) != EOF)
+	while ((ch = getopt(argc, argv, "f:")) != -1)
 		switch((char)ch) {
 		case 'f':
 			filename = optarg;
diff --git a/usr.sbin/sendmail/rmail/rmail.c b/usr.sbin/sendmail/rmail/rmail.c
index 7a33f54..f330622 100644
--- a/usr.sbin/sendmail/rmail/rmail.c
+++ b/usr.sbin/sendmail/rmail/rmail.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $Id: rmail.c,v 1.4 1997/02/22 16:13:27 peter Exp $
  */
 
 #ifndef lint
@@ -105,7 +105,7 @@ main(argc, argv)
 
 	debug = 0;
 	domain = "UUCP";		/* Default "domain". */
-	while ((ch = getopt(argc, argv, "D:T")) != EOF)
+	while ((ch = getopt(argc, argv, "D:T")) != -1)
 		switch (ch) {
 		case 'T':
 			debug = 1;