From: Kristofer Pettersson
Date: October 25 2010 12:30pm
Subject: bzr commit into mysql-5.5-bugteam branch (kristofer.pettersson:3095)
 Bug#54569
List-Archive: http://lists.mysql.com/commits/121804
X-Bug: 54569
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1755588179536801029=="

--===============1755588179536801029==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/thek/bzr/mysql-5.5-bugteam/ based on revid:bar@stripped

 3095 Kristofer Pettersson	2010-10-25
      Bug#54569 Some options are not allowed to take argument when passed with loose- prefix
      
      Boolean options cause parsing failures when they are given
      with prefix loose- and an argument, either in the command
      line or in configuration file.
      
      The reason was a faulty logic which forced the parsing
      to throw an error when an argument of type NO_ARG was
      used together with an argument which has been identified
      as a key-value pair. Despite the attribute NO_ARG these
      options actually take arguments if they are of type
      BOOL.
     @ include/my_getopt.h
        * More comments to help future refactoring
     @ mysys/my_getopt.c
        * removed if-statement which prevented logic for handling boolean types with arguments to be executed.
        * Added comments to aid in future refactoring.

    modified:
      include/my_getopt.h
      mysys/my_getopt.c
=== modified file 'include/my_getopt.h'
--- a/include/my_getopt.h	2010-06-11 01:30:49 +0000
+++ b/include/my_getopt.h	2010-10-25 12:30:07 +0000
@@ -39,6 +39,13 @@ C_MODE_START
 #define GET_ASK_ADDR	 128
 #define GET_TYPE_MASK	 127
 
+/**
+  Enumeration of the my_option::arg_type attributes.
+  It should be noted that for historical reasons variables with the combination
+  arg_type=NO_ARG, my_option::var_type=GET_BOOL still accepts
+  arguments. This is someone counter intuitive and care should be taken
+  if the code is refactored.
+*/
 enum get_opt_arg_type { NO_ARG, OPT_ARG, REQUIRED_ARG };
 
 struct st_typelib;

=== modified file 'mysys/my_getopt.c'
--- a/mysys/my_getopt.c	2010-09-28 15:15:58 +0000
+++ b/mysys/my_getopt.c	2010-10-25 12:30:07 +0000
@@ -360,14 +360,6 @@ int handle_options(int *argc, char ***ar
 	  }
 	  return EXIT_OPTION_DISABLED;
 	}
-	if (must_be_var && optp->arg_type == NO_ARG)
-	{
-	  if (my_getopt_print_errors)
-            my_getopt_error_reporter(ERROR_LEVEL, 
-                                     "%s: option '%s' cannot take an argument",
-                                     my_progname, optp->name);
-	  return EXIT_NO_ARGUMENT_ALLOWED;
-	}
         error= 0;
 	value= optp->var_type & GET_ASK_ADDR ?
 	  (*getopt_get_addr)(key_name, (uint) strlen(key_name), optp, &error) :
@@ -377,6 +369,11 @@ int handle_options(int *argc, char ***ar
 
 	if (optp->arg_type == NO_ARG)
 	{
+	  /*
+	    Due to historical reasons GET_BOOL var_types still accepts arguments
+	    despite the NO_ARG arg_type attribute. This can seems a bit unintuitive
+	    and care should be taken when refactoring this code.
+	  */
 	  if (optend && (optp->var_type & GET_TYPE_MASK) != GET_BOOL)
 	  {
 	    if (my_getopt_print_errors)
@@ -391,7 +388,7 @@ int handle_options(int *argc, char ***ar
 	      Set bool to 1 if no argument or if the user has used
 	      --enable-'option-name'.
 	      *optend was set to '0' if one used --disable-option
-	      */
+	    */
 	    (*argc)--;
 	    if (!optend || *optend == '1' ||
 		!my_strcasecmp(&my_charset_latin1, optend, "true"))
@@ -418,10 +415,9 @@ int handle_options(int *argc, char ***ar
 	else if (optp->arg_type == REQUIRED_ARG && !optend)
 	{
 	  /* Check if there are more arguments after this one,
-
-             Note: options loaded from config file that requires value
-             should always be in the form '--option=value'.
-           */
+       Note: options loaded from config file that requires value
+       should always be in the form '--option=value'.
+    */
 	  if (!is_cmdline_arg || !*++pos)
 	  {
 	    if (my_getopt_print_errors)


--===============1755588179536801029==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/kristofer.pettersson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kristofer.pettersson@stripped\
#   by58sn2aouyqrjj2
# target_branch: file:///home/thek/bzr/mysql-5.5-bugteam/
# testament_sha1: 56363eeff8307cfeeabc5c5735e1ce1a6780b389
# timestamp: 2010-10-25 14:30:09 +0200
# base_revision_id: bar@stripped
# 
# Begin bundle
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


--===============1755588179536801029==--