diff options
author | Jeremy Allison <jra@samba.org> | 2007-11-26 17:24:56 -0800 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2007-11-26 17:24:56 -0800 |
commit | 80c2446321c519797a57b8006942a983f8481d79 (patch) | |
tree | 1b3cc43b7cbcb2b1688027364f99291993467046 /source3/registry/reg_util.c | |
parent | d5b2325fcd597813b081d17161d26d85110c100b (diff) | |
download | samba-80c2446321c519797a57b8006942a983f8481d79.tar.gz samba-80c2446321c519797a57b8006942a983f8481d79.tar.bz2 samba-80c2446321c519797a57b8006942a983f8481d79.zip |
Remove pstrings from nsswitch/ and registry/
Jeremy.
(This used to be commit 331c0d6216e1a1607a49ed7eb4078e10138ec16a)
Diffstat (limited to 'source3/registry/reg_util.c')
-rw-r--r-- | source3/registry/reg_util.c | 138 |
1 files changed, 71 insertions, 67 deletions
diff --git a/source3/registry/reg_util.c b/source3/registry/reg_util.c index 7eb3c2a3a5..cd0982d09a 100644 --- a/source3/registry/reg_util.c +++ b/source3/registry/reg_util.c @@ -7,12 +7,12 @@ * 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/>. */ @@ -28,100 +28,106 @@ Utility function for splitting the base path of a registry path off by setting base and new_path to the apprapriate offsets withing the path. - + WARNING!! Does modify the original string! ***********************************************************************/ -bool reg_split_path( char *path, char **base, char **new_path ) +bool reg_split_path(char *path, char **base, char **new_path) { char *p; - + *new_path = *base = NULL; - - if ( !path) - return False; - + + if (!path) { + return false; + } *base = path; - - p = strchr( path, '\\' ); - + + p = strchr(path, '\\'); + if ( p ) { *p = '\0'; *new_path = p+1; } - - return True; -} + return true; +} /*********************************************************************** Utility function for splitting the base path of a registry path off by setting base and new_path to the appropriate offsets withing the path. - + WARNING!! Does modify the original string! ***********************************************************************/ -bool reg_split_key( char *path, char **base, char **key ) +bool reg_split_key(char *path, char **base, char **key) { char *p; - + *key = *base = NULL; - - if ( !path) - return False; - + + if (!path) { + return false; + } + *base = path; - - p = strrchr( path, '\\' ); - - if ( p ) { + + p = strrchr(path, '\\'); + + if (p) { *p = '\0'; *key = p+1; } - - return True; -} + return true; +} /********************************************************************** - The full path to the registry key is used as database after the + The full path to the registry key is used as database after the \'s are converted to /'s. Key string is also normalized to UPPER - case. + case. **********************************************************************/ -void normalize_reg_path( pstring keyname ) +char *normalize_reg_path(TALLOC_CTX *ctx, const char *keyname ) { - pstring_sub( keyname, "\\", "/" ); - strupper_m( keyname ); + char *nkeyname = talloc_string_sub(ctx, keyname, "\\", "/"); + if (!nkeyname) { + return NULL; + } + strupper_m(nkeyname); + return nkeyname; } /********************************************************************** move to next non-delimter character *********************************************************************/ -char* reg_remaining_path( const char *key ) +char *reg_remaining_path(TALLOC_CTX *ctx, const char *key) { - pstring new_path; - char *p; - - if ( !key || !*key ) + char *new_path = NULL; + char *p = NULL; + + if (!key || !*key) { return NULL; + } - pstrcpy( new_path, key ); + new_path = talloc_strdup(ctx, key); + if (!new_path) { + return NULL; + } /* normalize_reg_path( new_path ); */ - - if ( !(p = strchr( new_path, '\\' )) ) - { - if ( !(p = strchr( new_path, '/' )) ) + if (!(p = strchr(new_path, '\\')) ) { + if (!(p = strchr( new_path, '/'))) { p = new_path; - else + } else { p++; - } - else + } + } else { p++; - - return talloc_strdup(talloc_tos(), p); + } + + return p; } /********************************************************************** @@ -135,14 +141,14 @@ int regval_convert_multi_sz( uint16 *multi_string, size_t byte_len, char ***valu fstring buffer; uint16 *wp; size_t multi_len = byte_len / 2; - + if ( !multi_string || !values ) return 0; *values = NULL; /* just count the NULLs */ - + for ( i=0; (i<multi_len-1) && !(multi_string[i]==0x0 && multi_string[i+1]==0x0); i++ ) { /* peek ahead */ if ( multi_string[i+1] == 0x0 ) @@ -151,29 +157,29 @@ int regval_convert_multi_sz( uint16 *multi_string, size_t byte_len, char ***valu if ( num_strings == 0 ) return 0; - + if ( !(sz = TALLOC_ARRAY( NULL, char*, num_strings+1 )) ) { DEBUG(0,("reg_convert_multi_sz: talloc() failed!\n")); return -1; } wp = multi_string; - + for ( i=0; i<num_strings; i++ ) { rpcstr_pull( buffer, wp, sizeof(buffer), -1, STR_TERMINATE ); sz[i] = talloc_strdup( sz, buffer ); - + /* skip to the next string NULL and then one more */ while ( *wp ) wp++; wp++; } - + /* tag the array off with an empty string */ sz[i] = '\0'; - + *values = sz; - + return num_strings; } @@ -190,22 +196,22 @@ size_t regval_build_multi_sz( char **values, uint16 **buffer ) if ( !values || !buffer ) return 0; - + /* go ahead and alloc some space */ - + if ( !(buf = TALLOC_ARRAY( NULL, uint16, 2 )) ) { DEBUG(0,("regval_build_multi_sz: talloc() failed!\n")); return 0; } - + for ( i=0; values[i]; i++ ) { ZERO_STRUCT( sz ); /* DEBUG(0,("regval_build_multi_sz: building [%s]\n",values[i])); */ init_unistr2( &sz, values[i], UNI_STR_TERMINATE ); - + /* Alloc some more memory. Always add one one to account for the double NULL termination */ - + b = TALLOC_REALLOC_ARRAY( NULL, buf, uint16, buf_size+sz.uni_str_len+1 ); if ( !b ) { DEBUG(0,("regval_build_multi_sz: talloc() reallocation error!\n")); @@ -214,15 +220,15 @@ size_t regval_build_multi_sz( char **values, uint16 **buffer ) } buf = b; - /* copy the unistring2 buffer and increment the size */ + /* copy the unistring2 buffer and increment the size */ /* dump_data(1,sz.buffer,sz.uni_str_len*2); */ memcpy( buf+buf_size, sz.buffer, sz.uni_str_len*2 ); buf_size += sz.uni_str_len; - + /* cleanup rather than leaving memory hanging around */ TALLOC_FREE( sz.buffer ); } - + buf[buf_size++] = 0x0; *buffer = buf; @@ -230,5 +236,3 @@ size_t regval_build_multi_sz( char **values, uint16 **buffer ) /* return number of bytes */ return buf_size*2; } - - |