summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-08 12:02:40 +1000
committerAndrew Tridgell <tridge@samba.org>2011-04-13 14:47:07 +1000
commit2eea91957c90d6a5960b5350d2c4664812260a7b (patch)
tree792b34f76b72f3b7e0ade24b5f0b03bae30bb4f9 /lib/util
parent9941dfe9f6532ecbc317685046d74e6f90c41695 (diff)
downloadsamba-2eea91957c90d6a5960b5350d2c4664812260a7b.tar.gz
samba-2eea91957c90d6a5960b5350d2c4664812260a7b.tar.bz2
samba-2eea91957c90d6a5960b5350d2c4664812260a7b.zip
lib/util Move simple string routines into common code.
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/util_str.c54
-rw-r--r--lib/util/util_str_common.c54
-rw-r--r--lib/util/util_strlist.c26
-rwxr-xr-xlib/util/wscript_build3
4 files changed, 82 insertions, 55 deletions
diff --git a/lib/util/util_str.c b/lib/util/util_str.c
index 41183ff570..f31a8c5598 100644
--- a/lib/util/util_str.c
+++ b/lib/util/util_str.c
@@ -148,30 +148,6 @@ _PUBLIC_ const char *str_format_nbt_domain(TALLOC_CTX *mem_ctx, const char *s)
}
/**
- * Add a string to an array of strings.
- *
- * num should be a pointer to an integer that holds the current
- * number of elements in strings. It will be updated by this function.
- */
-_PUBLIC_ bool add_string_to_array(TALLOC_CTX *mem_ctx,
- const char *str, const char ***strings, int *num)
-{
- char *dup_str = talloc_strdup(mem_ctx, str);
-
- *strings = talloc_realloc(mem_ctx,
- *strings,
- const char *, ((*num)+1));
-
- if ((*strings == NULL) || (dup_str == NULL))
- return false;
-
- (*strings)[*num] = dup_str;
- *num += 1;
-
- return true;
-}
-
-/**
* Parse a string containing a boolean value.
*
* val will be set to the read value.
@@ -259,36 +235,6 @@ _PUBLIC_ bool conv_str_u64(const char * str, uint64_t * val)
}
/**
-Do a case-insensitive, whitespace-ignoring string compare.
-**/
-_PUBLIC_ int strwicmp(const char *psz1, const char *psz2)
-{
- /* if BOTH strings are NULL, return TRUE, if ONE is NULL return */
- /* appropriate value. */
- if (psz1 == psz2)
- return (0);
- else if (psz1 == NULL)
- return (-1);
- else if (psz2 == NULL)
- return (1);
-
- /* sync the strings on first non-whitespace */
- while (1) {
- while (isspace((int)*psz1))
- psz1++;
- while (isspace((int)*psz2))
- psz2++;
- if (toupper((unsigned char)*psz1) != toupper((unsigned char)*psz2)
- || *psz1 == '\0'
- || *psz2 == '\0')
- break;
- psz1++;
- psz2++;
- }
- return (*psz1 - *psz2);
-}
-
-/**
* Compare 2 strings.
*
* @note The comparison is case-insensitive.
diff --git a/lib/util/util_str_common.c b/lib/util/util_str_common.c
new file mode 100644
index 0000000000..e003d73d74
--- /dev/null
+++ b/lib/util/util_str_common.c
@@ -0,0 +1,54 @@
+/*
+ Unix SMB/CIFS implementation.
+ Samba utility functions
+
+ Copyright (C) Andrew Tridgell 1992-2001
+ Copyright (C) Simo Sorce 2001-2002
+ Copyright (C) Martin Pool 2003
+ Copyright (C) James Peach 2005
+
+ 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; either version 3 of the License, or
+ (at your option) any later version.
+
+ 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, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+
+/**
+Do a case-insensitive, whitespace-ignoring string compare.
+**/
+_PUBLIC_ int strwicmp(const char *psz1, const char *psz2)
+{
+ /* if BOTH strings are NULL, return TRUE, if ONE is NULL return */
+ /* appropriate value. */
+ if (psz1 == psz2)
+ return (0);
+ else if (psz1 == NULL)
+ return (-1);
+ else if (psz2 == NULL)
+ return (1);
+
+ /* sync the strings on first non-whitespace */
+ while (1) {
+ while (isspace((int)*psz1))
+ psz1++;
+ while (isspace((int)*psz2))
+ psz2++;
+ if (toupper_ascii((unsigned char)*psz1) != toupper_ascii((unsigned char)*psz2)
+ || *psz1 == '\0'
+ || *psz2 == '\0')
+ break;
+ psz1++;
+ psz2++;
+ }
+ return (*psz1 - *psz2);
+}
diff --git a/lib/util/util_strlist.c b/lib/util/util_strlist.c
index 953862da85..e8d2a74221 100644
--- a/lib/util/util_strlist.c
+++ b/lib/util/util_strlist.c
@@ -447,6 +447,32 @@ _PUBLIC_ const char **str_list_append_const(const char **list1,
}
/**
+ * Add a string to an array of strings.
+ *
+ * num should be a pointer to an integer that holds the current
+ * number of elements in strings. It will be updated by this function.
+ */
+_PUBLIC_ bool add_string_to_array(TALLOC_CTX *mem_ctx,
+ const char *str, const char ***strings, int *num)
+{
+ char *dup_str = talloc_strdup(mem_ctx, str);
+
+ *strings = talloc_realloc(mem_ctx,
+ *strings,
+ const char *, ((*num)+1));
+
+ if ((*strings == NULL) || (dup_str == NULL)) {
+ *num = 0;
+ return false;
+ }
+
+ (*strings)[*num] = dup_str;
+ *num += 1;
+
+ return true;
+}
+
+/**
add an entry to a string list
this assumes s will not change
*/
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 901f200de9..8e73e0f3e2 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -7,7 +7,8 @@ bld.SAMBA_LIBRARY('samba-util-common',
util_file.c time.c rbtree.c rfc1738.c select.c
genrand.c fsusage.c blocking.c become_daemon.c
signal.c system.c params.c util.c util_id.c util_net.c
- util_strlist.c idtree.c debug.c fault.c base64.c''',
+ util_strlist.c idtree.c debug.c fault.c base64.c
+ util_str_common.c''',
public_deps='talloc pthread LIBCRYPTO',
# until we get all the dependencies in this library in common
# we need to allow this library to be built with unresolved symbols