hacks to local getopt to avoid link problems with Linux

SCCS-vsn: usr.sbin/sendmail/src/conf.c 8.136
SCCS-vsn: usr.sbin/sendmail/src/conf.c 8.89.1.2

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 5780fea..e87f080 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)conf.c     8.135 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     8.89.1.2 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -1853,8 +1853,8 @@ extern int        optind, opterr;
 int    opterr = 1;             /* if error message should be printed */
 int    optind = 1;             /* index into parent argv vector */
 #endif
 int    opterr = 1;             /* if error message should be printed */
 int    optind = 1;             /* index into parent argv vector */
 #endif

-int    optopt;                 /* character checked for validity */
-char   *optarg;                /* argument associated with option */
+int    optopt = 0;             /* character checked for validity */
+char   *optarg = NULL;         /* argument associated with option */

 
 #define BADCH  (int)'?'
 #define EMSG   ""
 
 #define BADCH  (int)'?'
 #define EMSG   ""