Index: kernel/generic/src/lib/str.c =================================================================== --- kernel/generic/src/lib/str.c (revision b1696194837e19c7e4d446880d20ede25043bad4) +++ (revision ) @@ -1,840 +1,0 @@ -/* - * Copyright (c) 2001-2004 Jakub Jermar - * Copyright (c) 2005 Martin Decky - * Copyright (c) 2008 Jiri Svoboda - * Copyright (c) 2011 Martin Sucha - * Copyright (c) 2011 Oleg Romanenko - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup kernel_generic - * @{ - */ - -/** - * @file - * @brief String functions. - * - * Strings and characters use the Universal Character Set (UCS). The standard - * strings, called just strings are encoded in UTF-8. Wide strings (encoded - * in UTF-32) are supported to a limited degree. A single character is - * represented as char32_t.@n - * - * Overview of the terminology:@n - * - * Term Meaning - * -------------------- ---------------------------------------------------- - * byte 8 bits stored in uint8_t (unsigned 8 bit integer) - * - * character UTF-32 encoded Unicode character, stored in char32_t - * (unsigned 32 bit integer), code points 0 .. 1114111 - * are valid - * - * ASCII character 7 bit encoded ASCII character, stored in char - * (usually signed 8 bit integer), code points 0 .. 127 - * are valid - * - * string UTF-8 encoded NULL-terminated Unicode string, char * - * - * wide string UTF-32 encoded NULL-terminated Unicode string, - * char32_t * - * - * [wide] string size number of BYTES in a [wide] string (excluding - * the NULL-terminator), size_t - * - * [wide] string length number of CHARACTERS in a [wide] string (excluding - * the NULL-terminator), size_t - * - * [wide] string width number of display cells on a monospace display taken - * by a [wide] string, size_t - * - * - * Overview of string metrics:@n - * - * Metric Abbrev. Type Meaning - * ------ ------ ------ ------------------------------------------------- - * size n size_t number of BYTES in a string (excluding the - * NULL-terminator) - * - * length l size_t number of CHARACTERS in a string (excluding the - * null terminator) - * - * width w size_t number of display cells on a monospace display - * taken by a string - * - * - * Function naming prefixes:@n - * - * chr_ operate on characters - * ascii_ operate on ASCII characters - * str_ operate on strings - * wstr_ operate on wide strings - * - * [w]str_[n|l|w] operate on a prefix limited by size, length - * or width - * - * - * A specific character inside a [wide] string can be referred to by:@n - * - * pointer (char *, char32_t *) - * byte offset (size_t) - * character index (size_t) - * - */ - -#include - -#include -#include -#include -#include -#include -#include - -#include -#include - -/** Byte mask consisting of lowest @n bits (out of 8) */ -#define LO_MASK_8(n) ((uint8_t) ((1 << (n)) - 1)) - -/** Byte mask consisting of lowest @n bits (out of 32) */ -#define LO_MASK_32(n) ((uint32_t) ((1 << (n)) - 1)) - -/** Byte mask consisting of highest @n bits (out of 8) */ -#define HI_MASK_8(n) (~LO_MASK_8(8 - (n))) - -/** Number of data bits in a UTF-8 continuation byte */ -#define CONT_BITS 6 - -/** Decode a single character from a string. - * - * Decode a single character from a string of size @a size. Decoding starts - * at @a offset and this offset is moved to the beginning of the next - * character. In case of decoding error, offset generally advances at least - * by one. However, offset is never moved beyond size. - * - * @param str String (not necessarily NULL-terminated). - * @param offset Byte offset in string where to start decoding. - * @param size Size of the string (in bytes). - * - * @return Value of decoded character, U_SPECIAL on decoding error or - * NULL if attempt to decode beyond @a size. - * - */ -char32_t str_decode(const char *str, size_t *offset, size_t size) -{ - if (*offset + 1 > size) - return 0; - - /* First byte read from string */ - uint8_t b0 = (uint8_t) str[(*offset)++]; - - /* Determine code length */ - - unsigned int b0_bits; /* Data bits in first byte */ - unsigned int cbytes; /* Number of continuation bytes */ - - if ((b0 & 0x80) == 0) { - /* 0xxxxxxx (Plain ASCII) */ - b0_bits = 7; - cbytes = 0; - } else if ((b0 & 0xe0) == 0xc0) { - /* 110xxxxx 10xxxxxx */ - b0_bits = 5; - cbytes = 1; - } else if ((b0 & 0xf0) == 0xe0) { - /* 1110xxxx 10xxxxxx 10xxxxxx */ - b0_bits = 4; - cbytes = 2; - } else if ((b0 & 0xf8) == 0xf0) { - /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ - b0_bits = 3; - cbytes = 3; - } else { - /* 10xxxxxx -- unexpected continuation byte */ - return U_SPECIAL; - } - - if (*offset + cbytes > size) - return U_SPECIAL; - - char32_t ch = b0 & LO_MASK_8(b0_bits); - - /* Decode continuation bytes */ - while (cbytes > 0) { - uint8_t b = (uint8_t) str[(*offset)++]; - - /* Must be 10xxxxxx */ - if ((b & 0xc0) != 0x80) - return U_SPECIAL; - - /* Shift data bits to ch */ - ch = (ch << CONT_BITS) | (char32_t) (b & LO_MASK_8(CONT_BITS)); - cbytes--; - } - - return ch; -} - -/** Encode a single character to string representation. - * - * Encode a single character to string representation (i.e. UTF-8) and store - * it into a buffer at @a offset. Encoding starts at @a offset and this offset - * is moved to the position where the next character can be written to. - * - * @param ch Input character. - * @param str Output buffer. - * @param offset Byte offset where to start writing. - * @param size Size of the output buffer (in bytes). - * - * @return EOK if the character was encoded successfully, EOVERFLOW if there - * was not enough space in the output buffer or EINVAL if the character - * code was invalid. - */ -errno_t chr_encode(const char32_t ch, char *str, size_t *offset, size_t size) -{ - if (*offset >= size) - return EOVERFLOW; - - if (!chr_check(ch)) - return EINVAL; - - /* - * Unsigned version of ch (bit operations should only be done - * on unsigned types). - */ - uint32_t cc = (uint32_t) ch; - - /* Determine how many continuation bytes are needed */ - - unsigned int b0_bits; /* Data bits in first byte */ - unsigned int cbytes; /* Number of continuation bytes */ - - if ((cc & ~LO_MASK_32(7)) == 0) { - b0_bits = 7; - cbytes = 0; - } else if ((cc & ~LO_MASK_32(11)) == 0) { - b0_bits = 5; - cbytes = 1; - } else if ((cc & ~LO_MASK_32(16)) == 0) { - b0_bits = 4; - cbytes = 2; - } else if ((cc & ~LO_MASK_32(21)) == 0) { - b0_bits = 3; - cbytes = 3; - } else { - /* Codes longer than 21 bits are not supported */ - return EINVAL; - } - - /* Check for available space in buffer */ - if (*offset + cbytes >= size) - return EOVERFLOW; - - /* Encode continuation bytes */ - unsigned int i; - for (i = cbytes; i > 0; i--) { - str[*offset + i] = 0x80 | (cc & LO_MASK_32(CONT_BITS)); - cc = cc >> CONT_BITS; - } - - /* Encode first byte */ - str[*offset] = (cc & LO_MASK_32(b0_bits)) | HI_MASK_8(8 - b0_bits - 1); - - /* Advance offset */ - *offset += cbytes + 1; - - return EOK; -} - -/** Get size of string. - * - * Get the number of bytes which are used by the string @a str (excluding the - * NULL-terminator). - * - * @param str String to consider. - * - * @return Number of bytes used by the string - * - */ -size_t str_size(const char *str) -{ - size_t size = 0; - - while (*str++ != 0) - size++; - - return size; -} - -/** Get size of wide string. - * - * Get the number of bytes which are used by the wide string @a str (excluding the - * NULL-terminator). - * - * @param str Wide string to consider. - * - * @return Number of bytes used by the wide string - * - */ -size_t wstr_size(const char32_t *str) -{ - return (wstr_length(str) * sizeof(char32_t)); -} - -/** Get size of string with length limit. - * - * Get the number of bytes which are used by up to @a max_len first - * characters in the string @a str. If @a max_len is greater than - * the length of @a str, the entire string is measured (excluding the - * NULL-terminator). - * - * @param str String to consider. - * @param max_len Maximum number of characters to measure. - * - * @return Number of bytes used by the characters. - * - */ -size_t str_lsize(const char *str, size_t max_len) -{ - size_t len = 0; - size_t offset = 0; - - while (len < max_len) { - if (str_decode(str, &offset, STR_NO_LIMIT) == 0) - break; - - len++; - } - - return offset; -} - -/** Get size of wide string with length limit. - * - * Get the number of bytes which are used by up to @a max_len first - * wide characters in the wide string @a str. If @a max_len is greater than - * the length of @a str, the entire wide string is measured (excluding the - * NULL-terminator). - * - * @param str Wide string to consider. - * @param max_len Maximum number of wide characters to measure. - * - * @return Number of bytes used by the wide characters. - * - */ -size_t wstr_lsize(const char32_t *str, size_t max_len) -{ - return (wstr_nlength(str, max_len * sizeof(char32_t)) * sizeof(char32_t)); -} - -/** Get number of characters in a string. - * - * @param str NULL-terminated string. - * - * @return Number of characters in string. - * - */ -size_t str_length(const char *str) -{ - size_t len = 0; - size_t offset = 0; - - while (str_decode(str, &offset, STR_NO_LIMIT) != 0) - len++; - - return len; -} - -/** Get number of characters in a wide string. - * - * @param str NULL-terminated wide string. - * - * @return Number of characters in @a str. - * - */ -size_t wstr_length(const char32_t *wstr) -{ - size_t len = 0; - - while (*wstr++ != 0) - len++; - - return len; -} - -/** Get number of characters in a string with size limit. - * - * @param str NULL-terminated string. - * @param size Maximum number of bytes to consider. - * - * @return Number of characters in string. - * - */ -size_t str_nlength(const char *str, size_t size) -{ - size_t len = 0; - size_t offset = 0; - - while (str_decode(str, &offset, size) != 0) - len++; - - return len; -} - -/** Get number of characters in a string with size limit. - * - * @param str NULL-terminated string. - * @param size Maximum number of bytes to consider. - * - * @return Number of characters in string. - * - */ -size_t wstr_nlength(const char32_t *str, size_t size) -{ - size_t len = 0; - size_t limit = ALIGN_DOWN(size, sizeof(char32_t)); - size_t offset = 0; - - while ((offset < limit) && (*str++ != 0)) { - len++; - offset += sizeof(char32_t); - } - - return len; -} - -/** Check whether character is plain ASCII. - * - * @return True if character is plain ASCII. - * - */ -bool ascii_check(char32_t ch) -{ - if (ch <= 127) - return true; - - return false; -} - -/** Check whether character is valid - * - * @return True if character is a valid Unicode code point. - * - */ -bool chr_check(char32_t ch) -{ - if (ch <= 1114111) - return true; - - return false; -} - -/** Compare two NULL terminated strings. - * - * Do a char-by-char comparison of two NULL-terminated strings. - * The strings are considered equal iff their length is equal - * and both strings consist of the same sequence of characters. - * - * A string S1 is less than another string S2 if it has a character with - * lower value at the first character position where the strings differ. - * If the strings differ in length, the shorter one is treated as if - * padded by characters with a value of zero. - * - * @param s1 First string to compare. - * @param s2 Second string to compare. - * - * @return 0 if the strings are equal, -1 if the first is less than the second, - * 1 if the second is less than the first. - * - */ -int str_cmp(const char *s1, const char *s2) -{ - char32_t c1 = 0; - char32_t c2 = 0; - - size_t off1 = 0; - size_t off2 = 0; - - while (true) { - c1 = str_decode(s1, &off1, STR_NO_LIMIT); - c2 = str_decode(s2, &off2, STR_NO_LIMIT); - - if (c1 < c2) - return -1; - - if (c1 > c2) - return 1; - - if (c1 == 0 || c2 == 0) - break; - } - - return 0; -} - -/** Compare two NULL terminated strings with length limit. - * - * Do a char-by-char comparison of two NULL-terminated strings. - * The strings are considered equal iff - * min(str_length(s1), max_len) == min(str_length(s2), max_len) - * and both strings consist of the same sequence of characters, - * up to max_len characters. - * - * A string S1 is less than another string S2 if it has a character with - * lower value at the first character position where the strings differ. - * If the strings differ in length, the shorter one is treated as if - * padded by characters with a value of zero. Only the first max_len - * characters are considered. - * - * @param s1 First string to compare. - * @param s2 Second string to compare. - * @param max_len Maximum number of characters to consider. - * - * @return 0 if the strings are equal, -1 if the first is less than the second, - * 1 if the second is less than the first. - * - */ -int str_lcmp(const char *s1, const char *s2, size_t max_len) -{ - char32_t c1 = 0; - char32_t c2 = 0; - - size_t off1 = 0; - size_t off2 = 0; - - size_t len = 0; - - while (true) { - if (len >= max_len) - break; - - c1 = str_decode(s1, &off1, STR_NO_LIMIT); - c2 = str_decode(s2, &off2, STR_NO_LIMIT); - - if (c1 < c2) - return -1; - - if (c1 > c2) - return 1; - - if (c1 == 0 || c2 == 0) - break; - - ++len; - } - - return 0; - -} - -/** Copy string. - * - * Copy source string @a src to destination buffer @a dest. - * No more than @a size bytes are written. If the size of the output buffer - * is at least one byte, the output string will always be well-formed, i.e. - * null-terminated and containing only complete characters. - * - * @param dest Destination buffer. - * @param count Size of the destination buffer (must be > 0). - * @param src Source string. - * - */ -void str_cpy(char *dest, size_t size, const char *src) -{ - /* There must be space for a null terminator in the buffer. */ - assert(size > 0); - assert(src != NULL); - - size_t src_off = 0; - size_t dest_off = 0; - - char32_t ch; - while ((ch = str_decode(src, &src_off, STR_NO_LIMIT)) != 0) { - if (chr_encode(ch, dest, &dest_off, size - 1) != EOK) - break; - } - - dest[dest_off] = '\0'; -} - -/** Copy size-limited substring. - * - * Copy prefix of string @a src of max. size @a size to destination buffer - * @a dest. No more than @a size bytes are written. The output string will - * always be well-formed, i.e. null-terminated and containing only complete - * characters. - * - * No more than @a n bytes are read from the input string, so it does not - * have to be null-terminated. - * - * @param dest Destination buffer. - * @param count Size of the destination buffer (must be > 0). - * @param src Source string. - * @param n Maximum number of bytes to read from @a src. - * - */ -void str_ncpy(char *dest, size_t size, const char *src, size_t n) -{ - /* There must be space for a null terminator in the buffer. */ - assert(size > 0); - - size_t src_off = 0; - size_t dest_off = 0; - - char32_t ch; - while ((ch = str_decode(src, &src_off, n)) != 0) { - if (chr_encode(ch, dest, &dest_off, size - 1) != EOK) - break; - } - - dest[dest_off] = '\0'; -} - -/** Convert wide string to string. - * - * Convert wide string @a src to string. The output is written to the buffer - * specified by @a dest and @a size. @a size must be non-zero and the string - * written will always be well-formed. - * - * @param dest Destination buffer. - * @param size Size of the destination buffer. - * @param src Source wide string. - */ -void wstr_to_str(char *dest, size_t size, const char32_t *src) -{ - char32_t ch; - size_t src_idx; - size_t dest_off; - - /* There must be space for a null terminator in the buffer. */ - assert(size > 0); - - src_idx = 0; - dest_off = 0; - - while ((ch = src[src_idx++]) != 0) { - if (chr_encode(ch, dest, &dest_off, size - 1) != EOK) - break; - } - - dest[dest_off] = '\0'; -} - -/** Find first occurence of character in string. - * - * @param str String to search. - * @param ch Character to look for. - * - * @return Pointer to character in @a str or NULL if not found. - */ -char *str_chr(const char *str, char32_t ch) -{ - char32_t acc; - size_t off = 0; - size_t last = 0; - - while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) { - if (acc == ch) - return (char *) (str + last); - last = off; - } - - return NULL; -} - -/** Insert a wide character into a wide string. - * - * Insert a wide character into a wide string at position - * @a pos. The characters after the position are shifted. - * - * @param str String to insert to. - * @param ch Character to insert to. - * @param pos Character index where to insert. - * @param max_pos Characters in the buffer. - * - * @return True if the insertion was sucessful, false if the position - * is out of bounds. - * - */ -bool wstr_linsert(char32_t *str, char32_t ch, size_t pos, size_t max_pos) -{ - size_t len = wstr_length(str); - - if ((pos > len) || (pos + 1 > max_pos)) - return false; - - size_t i; - for (i = len; i + 1 > pos; i--) - str[i + 1] = str[i]; - - str[pos] = ch; - - return true; -} - -/** Remove a wide character from a wide string. - * - * Remove a wide character from a wide string at position - * @a pos. The characters after the position are shifted. - * - * @param str String to remove from. - * @param pos Character index to remove. - * - * @return True if the removal was sucessful, false if the position - * is out of bounds. - * - */ -bool wstr_remove(char32_t *str, size_t pos) -{ - size_t len = wstr_length(str); - - if (pos >= len) - return false; - - size_t i; - for (i = pos + 1; i <= len; i++) - str[i - 1] = str[i]; - - return true; -} - -/** Duplicate string. - * - * Allocate a new string and copy characters from the source - * string into it. The duplicate string is allocated via sleeping - * malloc(), thus this function can sleep in no memory conditions. - * - * The allocation cannot fail and the return value is always - * a valid pointer. The duplicate string is always a well-formed - * null-terminated UTF-8 string, but it can differ from the source - * string on the byte level. - * - * @param src Source string. - * - * @return Duplicate string. - * - */ -char *str_dup(const char *src) -{ - size_t size = str_size(src) + 1; - char *dest = malloc(size); - if (!dest) - return NULL; - - str_cpy(dest, size, src); - return dest; -} - -/** Duplicate string with size limit. - * - * Allocate a new string and copy up to @max_size bytes from the source - * string into it. The duplicate string is allocated via sleeping - * malloc(), thus this function can sleep in no memory conditions. - * No more than @max_size + 1 bytes is allocated, but if the size - * occupied by the source string is smaller than @max_size + 1, - * less is allocated. - * - * The allocation cannot fail and the return value is always - * a valid pointer. The duplicate string is always a well-formed - * null-terminated UTF-8 string, but it can differ from the source - * string on the byte level. - * - * @param src Source string. - * @param n Maximum number of bytes to duplicate. - * - * @return Duplicate string. - * - */ -char *str_ndup(const char *src, size_t n) -{ - size_t size = str_size(src); - if (size > n) - size = n; - - char *dest = malloc(size + 1); - if (!dest) - return NULL; - - str_ncpy(dest, size + 1, src, size); - return dest; -} - -void order_suffix(const uint64_t val, uint64_t *rv, char *suffix) -{ - if (val > UINT64_C(10000000000000000000)) { - *rv = val / UINT64_C(1000000000000000000); - *suffix = 'Z'; - } else if (val > UINT64_C(1000000000000000000)) { - *rv = val / UINT64_C(1000000000000000); - *suffix = 'E'; - } else if (val > UINT64_C(1000000000000000)) { - *rv = val / UINT64_C(1000000000000); - *suffix = 'T'; - } else if (val > UINT64_C(1000000000000)) { - *rv = val / UINT64_C(1000000000); - *suffix = 'G'; - } else if (val > UINT64_C(1000000000)) { - *rv = val / UINT64_C(1000000); - *suffix = 'M'; - } else if (val > UINT64_C(1000000)) { - *rv = val / UINT64_C(1000); - *suffix = 'k'; - } else { - *rv = val; - *suffix = ' '; - } -} - -void bin_order_suffix(const uint64_t val, uint64_t *rv, const char **suffix, - bool fixed) -{ - if (val > UINT64_C(1152921504606846976)) { - *rv = val / UINT64_C(1125899906842624); - *suffix = "EiB"; - } else if (val > UINT64_C(1125899906842624)) { - *rv = val / UINT64_C(1099511627776); - *suffix = "TiB"; - } else if (val > UINT64_C(1099511627776)) { - *rv = val / UINT64_C(1073741824); - *suffix = "GiB"; - } else if (val > UINT64_C(1073741824)) { - *rv = val / UINT64_C(1048576); - *suffix = "MiB"; - } else if (val > UINT64_C(1048576)) { - *rv = val / UINT64_C(1024); - *suffix = "KiB"; - } else { - *rv = val; - if (fixed) - *suffix = "B "; - else - *suffix = "B"; - } -} - -/** @} - */ Index: kernel/generic/src/lib/str_error.c =================================================================== --- kernel/generic/src/lib/str_error.c (revision b1696194837e19c7e4d446880d20ede25043bad4) +++ (revision ) @@ -1,100 +1,0 @@ -/* - * Copyright (c) 2010 Martin Decky - * Copyright (c) 2017 CZ.NIC, z.s.p.o. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include - -/* - * The arrays below are automatically generated from the same file that - * errno.h constants are generated from. Triple-include of the same list - * with redefinitions of __errno() macro are used to ensure that the - * information cannot get out of synch. This is inpired by musl libc. - */ - -#undef __errno_entry -#define __errno_entry(name, num, desc) name, - -static const errno_t err_num[] = { -#include -}; - -#undef __errno_entry -#define __errno_entry(name, num, desc) #name, - -static const char *err_name[] = { -#include -}; - -#undef __errno_entry -#define __errno_entry(name, num, desc) "[" #name "] " desc, - -static const char *err_desc[] = { -#include -}; - -/* Returns index corresponding to the given errno, or -1 if not found. */ -static int find_errno(errno_t e) -{ - /* - * Just a dumb linear search. - * There too few entries to warrant anything smarter. - */ - - int len = sizeof(err_num) / sizeof(errno_t); - - for (int i = 0; i < len; i++) { - if (err_num[i] == e) { - return i; - } - } - - return -1; -} - -const char *str_error_name(errno_t e) -{ - int i = find_errno(e); - - if (i >= 0) { - return err_name[i]; - } - - return "(unknown)"; -} - -const char *str_error(errno_t e) -{ - int i = find_errno(e); - - if (i >= 0) { - return err_desc[i]; - } - - return "Unknown error code"; -} Index: kernel/generic/src/lib/strtol.c =================================================================== --- kernel/generic/src/lib/strtol.c (revision b1696194837e19c7e4d446880d20ede25043bad4) +++ (revision ) @@ -1,303 +1,0 @@ -/* - * Copyright (c) 2005 Martin Decky - * Copyright (c) 2008 Jiri Svoboda - * Copyright (c) 2011 Martin Sucha - * Copyright (c) 2011 Oleg Romanenko - * Copyright (c) 2011 Jiri Zarevucky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup kernel_generic - * @{ - */ -/** @file - */ - -#include -#include -#include -#include -#include -#include -#include - -// FIXME: The original HelenOS functions return EOVERFLOW instead -// of ERANGE. It's a pointless distinction from standard functions, -// so we should change that. Beware the callers though. - -// TODO: more unit tests - -static inline int isdigit(int c) -{ - return c >= '0' && c <= '9'; -} - -static inline int islower(int c) -{ - return c >= 'a' && c <= 'z'; -} - -static inline int isupper(int c) -{ - return c >= 'A' && c <= 'Z'; -} - -static inline int isspace(int c) -{ - switch (c) { - case ' ': - case '\n': - case '\t': - case '\f': - case '\r': - case '\v': - return 1; - default: - return 0; - } -} - -static inline int _digit_value(int c) -{ - if (isdigit(c)) { - return c - '0'; - } else if (islower(c)) { - return c - 'a' + 10; - } else if (isupper(c)) { - return c - 'A' + 10; - } - return INT_MAX; -} - -/* - * FIXME: workaround for GCC "optimizing" the overflow check - * into soft-emulated 128b multiplication using `__multi3`, - * which we don't currently implement. - */ -__attribute__((noinline)) static uintmax_t _max_value(int base) -{ - return UINTMAX_MAX / base; -} - -static inline int _prefixbase(const char *restrict *nptrptr, bool nonstd) -{ - const char *nptr = *nptrptr; - - if (nptr[0] != '0') - return 10; - - if (nptr[1] == 'x' || nptr[1] == 'X') { - if (_digit_value(nptr[2]) < 16) { - *nptrptr += 2; - return 16; - } - } - - if (nonstd) { - switch (nptr[1]) { - case 'b': - case 'B': - if (_digit_value(nptr[2]) < 2) { - *nptrptr += 2; - return 2; - } - break; - case 'o': - case 'O': - if (_digit_value(nptr[2]) < 8) { - *nptrptr += 2; - return 8; - } - break; - case 'd': - case 'D': - case 't': - case 'T': - if (_digit_value(nptr[2]) < 10) { - *nptrptr += 2; - return 10; - } - break; - } - } - - return 8; -} - -static inline uintmax_t _strtoumax( - const char *restrict nptr, char **restrict endptr, int base, - bool *restrict sgn, errno_t *err, bool nonstd) -{ - assert(nptr != NULL); - assert(sgn != NULL); - - const char *first = nptr; - - /* Skip leading whitespace. */ - - while (isspace(*nptr)) { - nptr++; - } - - /* Parse sign, if any. */ - - switch (*nptr) { - case '-': - *sgn = true; - nptr++; - break; - case '+': - nptr++; - break; - } - - /* Figure out the base. */ - - if (base == 0) - base = _prefixbase(&nptr, nonstd); - - if (base == 16 && !nonstd) { - /* - * Standard strto* functions allow hexadecimal prefix to be - * present when base is explicitly set to 16. - * Our nonstandard str_* functions don't allow it. - * I don't know if that is intended, just matching the original - * functionality here. - */ - - if (nptr[0] == '0' && (nptr[1] == 'x' || nptr[1] == 'X') && - _digit_value(nptr[2]) < base) - nptr += 2; - } - - if (base < 2 || base > 36) { - *err = EINVAL; - return 0; - } - - /* Must be at least one digit. */ - - if (_digit_value(*nptr) >= base) { - /* No digits on input. */ - if (endptr != NULL) - *endptr = (char *) first; - return 0; - } - - /* Read the value. */ - - uintmax_t result = 0; - uintmax_t max = _max_value(base); - int digit; - - while (digit = _digit_value(*nptr), digit < base) { - if (result > max || - __builtin_add_overflow(result * base, digit, &result)) { - - *err = nonstd ? EOVERFLOW : ERANGE; - result = UINTMAX_MAX; - break; - } - - nptr++; - } - - /* Set endptr. */ - - if (endptr != NULL) { - /* - * Move the pointer to the end of the number, - * in case it isn't there already. - * This can happen when the number has legal formatting, - * but is out of range of the target type. - */ - while (_digit_value(*nptr) < base) { - nptr++; - } - - *endptr = (char *) nptr; - } - - return result; -} - -static inline uintmax_t _strtounsigned(const char *nptr, char **endptr, int base, - uintmax_t max, errno_t *err, bool nonstd) -{ - bool sgn = false; - uintmax_t number = _strtoumax(nptr, endptr, base, &sgn, err, nonstd); - - if (nonstd && sgn) { - /* Do not allow negative values */ - *err = EINVAL; - return 0; - } - - if (number > max) { - *err = nonstd ? EOVERFLOW : ERANGE; - return max; - } - - return (sgn ? -number : number); -} - -/** Convert string to uint64_t. - * - * @param nptr Pointer to string. - * @param endptr If not NULL, pointer to the first invalid character - * is stored here. - * @param base Zero or number between 2 and 36 inclusive. - * @param strict Do not allow any trailing characters. - * @param result Result of the conversion. - * - * @return EOK if conversion was successful. - * - */ -errno_t str_uint64_t(const char *nptr, char **endptr, unsigned int base, - bool strict, uint64_t *result) -{ - assert(result != NULL); - - errno_t rc = EOK; - char *lendptr = (char *) nptr; - - uintmax_t r = _strtounsigned(nptr, &lendptr, base, UINT64_MAX, &rc, true); - - if (endptr) - *endptr = lendptr; - - if (rc != EOK) - return rc; - - if (strict && *lendptr != '\0') - return EINVAL; - - *result = r; - return EOK; -} - -/** @} - */