sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

lib/util Move simple string routines into common code.

Browse Source 
Signed-off-by: Andrew Tridgell <tridge@samba.org>
This commit is contained in:
Andrew Bartlett 2011-04-08 12:02:40 +10:00 committed by Andrew Tridgell
parent 9941dfe9f6
commit 2eea91957c
6 changed files with 84 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/util/util_str.c
View File

@ -147,30 +147,6 @@ _PUBLIC_ const char *str_format_nbt_domain(TALLOC_CTX *mem_ctx, const char *s)
return ret;
}
/**
* 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.
*
@ -258,36 +234,6 @@ _PUBLIC_ bool conv_str_u64(const char * str, uint64_t * val)
return true;
}
/**
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.
*

54
lib/util/util_str_common.c Normal file
View File

@ -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);
}

26
lib/util/util_strlist.c
View File

@ -446,6 +446,32 @@ _PUBLIC_ const char **str_list_append_const(const char **list1,
return ret;
}
/**
* 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

3
lib/util/wscript_build
View File

@ -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

3
source3/Makefile.in
View File

@ -450,7 +450,8 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
lib/access.o lib/smbrun.o \
lib/bitmap.o lib/dprintf.o $(UTIL_REG_OBJ) \
lib/wins_srv.o \
lib/util_str.o ../lib/util/base64.o lib/util_sid.o \
lib/util_str.o ../lib/util/util_str_common.o \
../lib/util/base64.o lib/util_sid.o \
../lib/util/charset/util_unistr_w.o ../lib/util/charset/codepoints.o ../lib/util/charset/util_str.o lib/util_file.o \
lib/util.o lib/util_cmdline.o lib/util_names.o \
lib/util_sock.o lib/sock_exec.o lib/util_sec.o \

49
source3/lib/util_str.c
View File

@ -208,36 +208,6 @@ bool strnequal(const char *s1,const char *s2,size_t n)
return(StrnCaseCmp(s1,s2,n)==0);
}
/**
Do a case-insensitive, whitespace-ignoring string compare.
**/
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(*psz1) != toupper_ascii(*psz2) ||
*psz1 == '\0' || *psz2 == '\0')
break;
psz1++;
psz2++;
}
return (*psz1 - *psz2);
}
/**
Convert a string to "normal" form.
**/
@ -1635,25 +1605,6 @@ void string_append(char **left, const char *right)
safe_strcat(*left, right, new_len-1);
}
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_ARRAY(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;
}
/* Append an sprintf'ed string. Double buffer size on demand. Usable without
* error checking in between. The indiation that something weird happened is
* string==NULL */