Copy respective revisions from usr.sbin/sendmail/*/* - use -1 with getopt.

svn path=/head/; revision=38076

contrib/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)) {

contrib/sendmail/mail.local/mail.local.c

@@ -259,7 +259,7 @@ main(argc, argv)
 #endif
 
 	from = NULL;
-	while ((ch = getopt(argc, argv, "df:r:l")) != EOF)
+	while ((ch = getopt(argc, argv, "df:r:l")) != -1)
 		switch(ch) {
 		case 'd':		/* Backward compatible. */
 			break;

contrib/sendmail/mailstats/mailstats.c

@@ -55,7 +55,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)
 		{

contrib/sendmail/makemap/makemap.c

@@ -149,7 +149,7 @@ main(argc, argv)
 #else
 #define OPTIONS		"C:Ndforsv"
 #endif
-	while ((opt = getopt(argc, argv, OPTIONS)) != EOF)
+	while ((opt = getopt(argc, argv, OPTIONS)) != -1)
 	{
 		switch (opt)
 		{

contrib/sendmail/praliases/praliases.c

@@ -70,7 +70,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;

contrib/sendmail/rmail/rmail.c

@@ -145,7 +145,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;