From 373b8337c7b6c6243810be250083fa4773891e92 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 3 Apr 2000 16:22:35 +0000
Subject: [PATCH] Many files:   badblocks.c, dumpe2fs.c, e2label.c, mke2fs.c,
 tune2fs.c, uuidgen.c:   	For platforms that don't define optarg.h,
 manually define optarg and   	optind. ChangeLog, main.c:   main.c: For
 platforms that don't define optarg.h, manually define   	optarg and
 optind. ChangeLog, unix.c:   unix.c: For platforms that don't define
 optarg.h, manually define   	optarg and optind.

---
 e2fsck/ChangeLog | 5 +++++
 e2fsck/unix.c    | 3 +++
 misc/ChangeLog   | 4 ++++
 misc/badblocks.c | 3 +++
 misc/dumpe2fs.c  | 3 +++
 misc/e2label.c   | 3 +++
 misc/mke2fs.c    | 3 +++
 misc/tune2fs.c   | 3 +++
 misc/uuidgen.c   | 3 +++
 resize/ChangeLog | 5 +++++
 resize/main.c    | 3 +++
 11 files changed, 38 insertions(+)

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 8bbf22e..3cd1387 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-03  Theodore Ts'o  <tytso@valinux.com>
+
+	* unix.c: For platforms that don't define optarg.h, manually
+		define optarg and optind.
+
 2000-03-20  Theodore Ts'o  <tytso@valinux.com>
 
 	* pass1.c (check_immutable, e2fsck_pass1_check_device_inode):
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 16c9491..9f5d7f0 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -22,6 +22,9 @@
 #endif
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
 #endif
 #include <unistd.h>
 #ifdef HAVE_ERRNO_H
diff --git a/misc/ChangeLog b/misc/ChangeLog
index 78fa469..8240ff0 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,5 +1,9 @@
 2000-04-03  Theodore Ts'o  <tytso@valinux.com>
 
+	* badblocks.c, dumpe2fs.c, e2label.c, mke2fs.c, tune2fs.c,
+		uuidgen.c: For platforms that don't define optarg.h,
+		manually define optarg and optind.
+
 	* badblocks.8.in: Updated manual page with suggestions from David
 		Beattie.
 
diff --git a/misc/badblocks.c b/misc/badblocks.c
index 475c9c3..747b631 100644
--- a/misc/badblocks.c
+++ b/misc/badblocks.c
@@ -33,6 +33,9 @@
 #include <fcntl.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
 #endif
 #include <signal.h>
 #include <stdio.h>
diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c
index 9056129..3a2d524 100644
--- a/misc/dumpe2fs.c
+++ b/misc/dumpe2fs.c
@@ -22,6 +22,9 @@
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
 #endif
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/misc/e2label.c b/misc/e2label.c
index 477c34b..cf65513 100644
--- a/misc/e2label.c
+++ b/misc/e2label.c
@@ -19,6 +19,9 @@
 #include <time.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 820b9d2..9b9bd31 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -25,6 +25,9 @@
 #endif
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 6903dc1..06e5c20 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -30,6 +30,9 @@
 #include <grp.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
 #endif
 #include <pwd.h>
 #include <stdio.h>
diff --git a/misc/uuidgen.c b/misc/uuidgen.c
index b1d24ea..b6f3837 100644
--- a/misc/uuidgen.c
+++ b/misc/uuidgen.c
@@ -12,6 +12,9 @@
 #include <stdio.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
 #endif
 #include "uuid/uuid.h"
 #include "nls-enable.h"
diff --git a/resize/ChangeLog b/resize/ChangeLog
index ff00270..90c0a6c 100644
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-03  Theodore Ts'o  <tytso@valinux.com>
+
+	* main.c: For platforms that don't define optarg.h, manually
+		define optarg and optind.
+
 2000-02-02  Theodore Ts'o  <tytso@valinux.com>
 
 	* resize2fs.h: Remove unneeded #include of linux/fs.h
diff --git a/resize/main.c b/resize/main.c
index 77fac23..3abff63 100644
--- a/resize/main.c
+++ b/resize/main.c
@@ -10,6 +10,9 @@
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
 #endif
 #include <fcntl.h>
 #include <sys/ioctl.h>
-- 
1.8.3.1