This is as far as I got on my last iteration, electing what appear to be 'normal string' handling functions that are part of svn.
Based on apr's short-name preference, I had yet to redecorate these functions as apr_cstr_* functions, but that I will get to tomorrow. If you see something that doesn't fall into the normal string / general purpose criteria, feel free to holler before the first commit... Bill On Thu, Jan 21, 2016 at 4:07 PM, William A Rowe Jr <[email protected]> wrote: > No time to respond until pressing $dayjob stuff is finished this evening, > but I have the entire day tomorrow to devote to bringing the proposed > change to trunk/ and proposing for backport to branches/1.6/ > > On Thu, Jan 21, 2016 at 10:47 AM, Jim Jagielski <[email protected]> wrote: > >> Any updates on this?? >> > >
/** * @copyright * ==================================================================== * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. * ==================================================================== * @endcopyright * * @file apr_cstr.h * @brief C string goodies. * * These apr_cstr_* functions are for classic, C char * string text handling, * and notabilty do treat all text in C (a.k.a. POSIX) locale using the minimal * POSIX character set, either ASCII or a corresponding EBCDIC subset. Other * char values outside of that set are treated as opaque bytes, any multi-byte * characters are treated as their individual distinct bytes. Characters with * multi-byte sequences that fall into the ASCII range may cause unexpected * results, however the UTF-8 multibyte characters all fall outside of these * characters and are safe to use. */ #ifndef APR_CSTR_H #define APR_CSTR_H #include <apr.h> /* for apr_size_t */ #include <apr_pools.h> /* for apr_pool_t */ #include <apr_tables.h> /* for apr_array_header_t */ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ /** * @defgroup apr_string String handling * @{ */ /** * @defgroup apr_cstr C string functions * @{ */ /** Divide @a input into substrings, interpreting any char from @a sep * as a token separator. * * Return an array of copies of those substrings (plain const char*), * allocating both the array and the copies in @a pool. * * None of the elements added to the array contain any of the * characters in @a sep_chars, and none of the new elements are empty * (thus, it is possible that the returned array will have length * zero). * * If @a chop_whitespace is TRUE, then remove leading and trailing * whitespace from the returned strings. */ apr_array_header_t * svn_cstring_split(const char *input, const char *sep_chars, svn_boolean_t chop_whitespace, apr_pool_t *pool); /** Like svn_cstring_split(), but append to existing @a array instead of * creating a new one. Allocate the copied substrings in @a pool * (i.e., caller decides whether or not to pass @a array->pool as @a pool). */ void svn_cstring_split_append(apr_array_header_t *array, const char *input, const char *sep_chars, svn_boolean_t chop_whitespace, apr_pool_t *pool); /** Return @c TRUE iff @a str matches any of the elements of @a list, a list * of zero or more glob patterns. */ svn_boolean_t svn_cstring_match_glob_list(const char *str, const apr_array_header_t *list); /** Return @c TRUE iff @a str exactly matches any of the elements of @a list. * * @since new in 1.7 */ svn_boolean_t svn_cstring_match_list(const char *str, const apr_array_header_t *list); /** * Get the next token from @a *str interpreting any char from @a sep as a * token separator. Separators at the beginning of @a str will be skipped. * Returns a pointer to the beginning of the first token in @a *str or NULL * if no token is left. Modifies @a str such that the next call will return * the next token. * * @note The content of @a *str may be modified by this function. * * @since New in 1.8. */ char * svn_cstring_tokenize(const char *sep, char **str); /** * Return the number of line breaks in @a msg, allowing any kind of newline * termination (CR, LF, CRLF, or LFCR), even inconsistent. * * @since New in 1.2. */ int svn_cstring_count_newlines(const char *msg); /** * Return a cstring which is the concatenation of @a strings (an array * of char *) each followed by @a separator (that is, @a separator * will also end the resulting string). Allocate the result in @a pool. * If @a strings is empty, then return the empty string. * * @since New in 1.2. */ char * svn_cstring_join(const apr_array_header_t *strings, const char *separator, apr_pool_t *pool); /** * Compare two strings @a atr1 and @a atr2, treating case-equivalent * unaccented Latin (ASCII subset) letters as equal. * * Returns in integer greater than, equal to, or less than 0, * according to whether @a str1 is considered greater than, equal to, * or less than @a str2. * * @since New in 1.5. */ int svn_cstring_casecmp(const char *str1, const char *str2); /** * Parse the C string @a str into a 64 bit number, and return it in @a *n. * Assume that the number is represented in base @a base. * Raise an error if conversion fails (e.g. due to overflow), or if the * converted number is smaller than @a minval or larger than @a maxval. * * Leading whitespace in @a str is skipped in a locale-dependent way. * After that, the string may contain an optional '+' (positive, default) * or '-' (negative) character, followed by an optional '0x' prefix if * @a base is 0 or 16, followed by numeric digits appropriate for the base. * If there are any more characters after the numeric digits, an error is * returned. * * If @a base is zero, then a leading '0x' or '0X' prefix means hexadecimal, * else a leading '0' means octal (implemented, though not documented, in * apr_strtoi64() in APR 0.9.0 through 1.5.0), else use base ten. * * @since New in 1.7. */ svn_error_t * svn_cstring_strtoi64(apr_int64_t *n, const char *str, apr_int64_t minval, apr_int64_t maxval, int base); /** * Parse the C string @a str into a 64 bit number, and return it in @a *n. * Assume that the number is represented in base 10. * Raise an error if conversion fails (e.g. due to overflow). * * The behaviour otherwise is as described for svn_cstring_strtoi64(). * * @since New in 1.7. */ svn_error_t * svn_cstring_atoi64(apr_int64_t *n, const char *str); /** * Parse the C string @a str into a 32 bit number, and return it in @a *n. * Assume that the number is represented in base 10. * Raise an error if conversion fails (e.g. due to overflow). * * The behaviour otherwise is as described for svn_cstring_strtoi64(). * * @since New in 1.7. */ svn_error_t * svn_cstring_atoi(int *n, const char *str); /** * Parse the C string @a str into an unsigned 64 bit number, and return * it in @a *n. Assume that the number is represented in base @a base. * Raise an error if conversion fails (e.g. due to overflow), or if the * converted number is smaller than @a minval or larger than @a maxval. * * Leading whitespace in @a str is skipped in a locale-dependent way. * After that, the string may contain an optional '+' (positive, default) * or '-' (negative) character, followed by an optional '0x' prefix if * @a base is 0 or 16, followed by numeric digits appropriate for the base. * If there are any more characters after the numeric digits, an error is * returned. * * If @a base is zero, then a leading '0x' or '0X' prefix means hexadecimal, * else a leading '0' means octal (implemented, though not documented, in * apr_strtoi64() in APR 0.9.0 through 1.5.0), else use base ten. * * @warning The implementation used since version 1.7 returns an error * if the parsed number is greater than APR_INT64_MAX, even if it is not * greater than @a maxval. * * @since New in 1.7. */ svn_error_t * svn_cstring_strtoui64(apr_uint64_t *n, const char *str, apr_uint64_t minval, apr_uint64_t maxval, int base); /** * Parse the C string @a str into an unsigned 64 bit number, and return * it in @a *n. Assume that the number is represented in base 10. * Raise an error if conversion fails (e.g. due to overflow). * * The behaviour otherwise is as described for svn_cstring_strtoui64(), * including the upper limit of APR_INT64_MAX. * * @since New in 1.7. */ svn_error_t * svn_cstring_atoui64(apr_uint64_t *n, const char *str); /** * Parse the C string @a str into an unsigned 32 bit number, and return * it in @a *n. Assume that the number is represented in base 10. * Raise an error if conversion fails (e.g. due to overflow). * * The behaviour otherwise is as described for svn_cstring_strtoui64(), * including the upper limit of APR_INT64_MAX. * * @since New in 1.7. */ svn_error_t * svn_cstring_atoui(unsigned int *n, const char *str); /** * Skip the common prefix @a prefix from the C string @a str, and return * a pointer to the next character after the prefix. * Return @c NULL if @a str does not start with @a prefix. * * @since New in 1.9. */ const char * svn_cstring_skip_prefix(const char *str, const char *prefix); /** @} */ /** @} */ #ifdef __cplusplus } #endif /* __cplusplus */ #endif /* SVN_STRING_H */
