From b5b49e7a4d5e97884f17ee3ed000635be5c999ac Mon Sep 17 00:00:00 2001
From: axel <axel@liljencrantz.se>
Date: Sat, 27 May 2006 00:55:51 +1000
Subject: [PATCH] Make sure that getopt flags are only written down once

darcs-hash:20060526145551-ac50b-5411809433e277cd0bdebc34907ee3312a8a0263.gz
---
 fishd.c     | 9 +++++++--
 mimedb.c    | 9 +++++++--
 set_color.c | 9 +++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/fishd.c b/fishd.c
index c78a0fcf3..7409f82e1 100644
--- a/fishd.c
+++ b/fishd.c
@@ -110,6 +110,11 @@ time the original barrier request was sent have been received.
 */
 #define LOCKTIMEOUT 1
 
+/**
+   Getopt short switches for fishd
+*/
+#define GETOPT_STRING "hv"
+
 /**
    The list of connections to clients
 */
@@ -502,14 +507,14 @@ int main( int argc, char ** argv )
 		
 		int opt = getopt_long( argc,
 							   argv, 
-							   "hv",
+							   GETOPT_STRING,
 							   long_options, 
 							   &opt_index );
 		
 #else	
 		int opt = getopt( argc,
 						  argv, 
-						  "hv" );
+						  GETOPT_STRING );
 #endif
 		if( opt == -1 )
 			break;
diff --git a/mimedb.c b/mimedb.c
index 19173c59f..3684326f7 100644
--- a/mimedb.c
+++ b/mimedb.c
@@ -88,6 +88,11 @@ license. Read the source code of the library for more information.
 */
 #define MIMEDB "mimedb"
 
+/**
+   Getopt short switches for mimedb
+*/
+#define GETOPT_STRING "tfimdalhv"
+
 /**
    All types of input and output possible
 */
@@ -1216,14 +1221,14 @@ int main (int argc, char *argv[])
 		
 		int opt = getopt_long( argc,
 							   argv, 
-							   "tfimdalhv", 
+							   GETOPT_STRING,
 							   long_options, 
 							   &opt_index );
 		
 #else	
 		int opt = getopt( argc,
 						  argv, 
-						  "tfimdalhv" );
+						  GETOPT_STRING );
 #endif
 		if( opt == -1 )
 			break;
diff --git a/set_color.c b/set_color.c
index 5228987e2..f762c64dc 100644
--- a/set_color.c
+++ b/set_color.c
@@ -49,6 +49,11 @@
 */
 #define SET_COLOR "set_color"
 
+/**
+   Getopt short switches for set_color
+*/
+#define GETOPT_STRING "b:hvoc"
+
 #if HAVE_GETTEXT
 #define _(string) gettext(string)
 #else
@@ -186,13 +191,13 @@ int main( int argc, char **argv )
 		
 		int opt = getopt_long( argc,
 							   argv, 
-							   "b:hvoc", 
+							   GETOPT_STRING, 
 							   long_options, 
 							   &opt_index );
 #else
 		int opt = getopt( argc,
 						  argv, 
-						  "b:hvoc" );
+						  GETOPT_STRING );
 #endif
 		if( opt == -1 )
 			break;