Adding upstream version 1:10.11.6.upstream/1%10.11.6

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 70 insertions, 0 deletions

diff --git a/sql-common/my_user.c b/sql-common/my_user.c
new file mode 100644
index 00000000..4af0f8f0
--- /dev/null
+++ b/sql-common/my_user.c
@@ -0,0 +1,70 @@
+/* Copyright (c) 2006-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+   Use is subject to license terms.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
+#include <my_global.h>
+#include <my_user.h>
+#include <m_string.h>
+#include <mysql_com.h>
+
+/*
+  Parse user value to user name and host name parts.
+
+  SYNOPSIS
+    user_id_str     [IN]  User value string (the source).
+    user_id_len     [IN]  Length of the user value.
+    user_name_str   [OUT] Buffer to store user name part.
+                          Must be not less than USERNAME_LENGTH + 1.
+    user_name_len   [OUT] A place to store length of the user name part.
+    host_name_str   [OUT] Buffer to store host name part.
+                          Must be not less than HOSTNAME_LENGTH + 1.
+    host_name_len   [OUT] A place to store length of the host name part.
+
+ RETURN
+   0 - if only a user was set, no '@' was found
+   1 - if both user and host were set
+*/
+
+int parse_user(const char *user_id_str, size_t user_id_len,
+               char *user_name_str, size_t *user_name_len,
+               char *host_name_str, size_t *host_name_len)
+{
+  char *p= strrchr(user_id_str, '@');
+
+  if (!p)
+  {
+    *user_name_len= user_id_len;
+    *host_name_len= 0;
+  }
+  else
+  {
+    *user_name_len= (uint) (p - user_id_str);
+    *host_name_len= (uint) (user_id_len - *user_name_len - 1);
+  }
+
+  if (*user_name_len > USERNAME_LENGTH)
+    *user_name_len= USERNAME_LENGTH;
+
+  if (*host_name_len > HOSTNAME_LENGTH)
+    *host_name_len= HOSTNAME_LENGTH;
+
+  memcpy(user_name_str, user_id_str, *user_name_len);
+  memcpy(host_name_str, p + 1, *host_name_len);
+
+  user_name_str[*user_name_len]= 0;
+  host_name_str[*host_name_len]= 0;
+
+  return p != NULL;
+}