Merge lp:~mordred/drizzle/bug552936 into lp:~drizzle-trunk/drizzle/development

[Monty Taylor]

Fix the --defaults-file check.

[lp:~mordred/drizzle/bug552936]

1430. By Monty Taylor on 2010-04-01

The logic here was actually looking for strlen.

1431. By Monty Taylor on 2010-04-01

Use const std::string.

=== modified file 'drizzled/internal/default.cc'
--- drizzled/internal/default.cc	2010-02-05 18:02:02 +0000
+++ drizzled/internal/default.cc	2010-04-01 18:32:30 +0000
@@ -324,26 +324,37 @@
   int org_argc= argc, prev_argc= 0;
   *defaults= *extra_defaults= *group_suffix= 0;
 
+  const std::string DEFAULTS_FILE("--defaults-file=");
+  const std::string DEFAULTS_EXTRA_FILE("--defaults-extra-file=");
+  const std::string DEFAULTS_GROUP_SUFFIX("--defaults-group-suffix=");
+
   while (argc >= 2 && argc != prev_argc)
   {
     /* Skip program name or previously handled argument */
     argv++;
     prev_argc= argc;                            /* To check if we found */
-    if (!*defaults && (strncmp(*argv,"--defaults-file=", sizeof("--defaults-file=")) == 0))
+    if (!*defaults && (strncmp(*argv,
+                               DEFAULTS_FILE.c_str(),
+                               DEFAULTS_FILE.size()) == 0))
     {
-      *defaults= *argv + sizeof("--defaults-file=")-1;
+      *defaults= *argv + DEFAULTS_FILE.size();
        argc--;
        continue;
     }
-    if (!*extra_defaults && (strncmp(*argv, "--defaults-extra-file=", sizeof("--defaults-extra-file=")) == 0))
+    if (!*extra_defaults && (strncmp(*argv, 
+                                     DEFAULTS_EXTRA_FILE.c_str(),
+                                     DEFAULTS_EXTRA_FILE.size()) == 0))
     {
-      *extra_defaults= *argv + sizeof("--defaults-extra-file=")-1;
+      *extra_defaults= *argv + DEFAULTS_EXTRA_FILE.size();
       argc--;
       continue;
     }
-    if (!*group_suffix && (strncmp(*argv, "--defaults-group-suffix=", sizeof("--defaults-group-suffix=")) == 0))
+    if (!*group_suffix && (strncmp(*argv, 
+                                   DEFAULTS_GROUP_SUFFIX.c_str(),
+                                   DEFAULTS_GROUP_SUFFIX.size()) == 0))
+
     {
-      *group_suffix= *argv + sizeof("--defaults-group-suffix=")-1;
+      *group_suffix= *argv + DEFAULTS_GROUP_SUFFIX.size();
       argc--;
       continue;
     }