From 896026a8991aa4f55c2e7a20efc22f1a8c52ee80 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 17 Nov 2015 03:31:32 +0100 Subject: move strerror*.c to new dir: strerror/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/string/strerror.c | 44 ---------------------------- src/string/strerror/strerror.c | 44 ++++++++++++++++++++++++++++ src/string/strerror/strerror_l.c | 44 ++++++++++++++++++++++++++++ src/string/strerror/strerror_r_gnu.c | 45 +++++++++++++++++++++++++++++ src/string/strerror/strerror_r_xsi.c | 56 ++++++++++++++++++++++++++++++++++++ src/string/strerror_l.c | 44 ---------------------------- src/string/strerror_r_gnu.c | 45 ----------------------------- src/string/strerror_r_xsi.c | 56 ------------------------------------ 8 files changed, 189 insertions(+), 189 deletions(-) delete mode 100644 src/string/strerror.c create mode 100644 src/string/strerror/strerror.c create mode 100644 src/string/strerror/strerror_l.c create mode 100644 src/string/strerror/strerror_r_gnu.c create mode 100644 src/string/strerror/strerror_r_xsi.c delete mode 100644 src/string/strerror_l.c delete mode 100644 src/string/strerror_r_gnu.c delete mode 100644 src/string/strerror_r_xsi.c (limited to 'src/string') diff --git a/src/string/strerror.c b/src/string/strerror.c deleted file mode 100644 index 315e40d..0000000 --- a/src/string/strerror.c +++ /dev/null @@ -1,44 +0,0 @@ -/** - * slibc — Yet another C library - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ -#include - - - -/** - * Return a textual representation of an error code. - * This error code must from `errno`. - * - * This implementation of `strerror` cannot fail. however - * POSIX specifies that it can fail, any may only set `errno` - * if it does fail. You should therefore, set `errno` to - * zero before calling this function, and inspect `errno` - * when it returns, as there is no reserved return value - * that indicates and error. - * - * The returned value must not be modified or freed. - * - * As a slibc-specific modification, this function is MT-Safe. - * - * @param errnum The error code. - * @return A description of the error. - */ -char* strerror(int errnum) -{ - return strerror_l(errnum, 0 /* TODO CURRENT_LOCALE, not defined */); -} - diff --git a/src/string/strerror/strerror.c b/src/string/strerror/strerror.c new file mode 100644 index 0000000..315e40d --- /dev/null +++ b/src/string/strerror/strerror.c @@ -0,0 +1,44 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * 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 . + */ +#include + + + +/** + * Return a textual representation of an error code. + * This error code must from `errno`. + * + * This implementation of `strerror` cannot fail. however + * POSIX specifies that it can fail, any may only set `errno` + * if it does fail. You should therefore, set `errno` to + * zero before calling this function, and inspect `errno` + * when it returns, as there is no reserved return value + * that indicates and error. + * + * The returned value must not be modified or freed. + * + * As a slibc-specific modification, this function is MT-Safe. + * + * @param errnum The error code. + * @return A description of the error. + */ +char* strerror(int errnum) +{ + return strerror_l(errnum, 0 /* TODO CURRENT_LOCALE, not defined */); +} + diff --git a/src/string/strerror/strerror_l.c b/src/string/strerror/strerror_l.c new file mode 100644 index 0000000..838040f --- /dev/null +++ b/src/string/strerror/strerror_l.c @@ -0,0 +1,44 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * 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 . + */ +#include + + + +/** + * Return a textual representation of an error code. + * This error code must from `errno`. + * + * POSIX specifies `errno` may only be set on failure, + * and reserves no return value to indicate such. + * You should therefore, set `errno` to zero before calling + * this function, and inspect `errno` when it returns. + * + * The returned value must not be modified or freed. + * + * @param errnum The error code. + * @param locale The locale, must be a valid locale and not + * `LC_GLOBAL_LOCALE`, lest the behaviour is undefined. + * @return A description of the error. + */ +char* strerror_l(int errnum, locale_t locale) +{ + /* TODO implement strerror_l */ + return strerror(errnum); + (void) locale; +} + diff --git a/src/string/strerror/strerror_r_gnu.c b/src/string/strerror/strerror_r_gnu.c new file mode 100644 index 0000000..3e8bfd4 --- /dev/null +++ b/src/string/strerror/strerror_r_gnu.c @@ -0,0 +1,45 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * 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 . + */ +#include +#include + + + +/** + * Reenterant variant of `strerror`. + * + * This is a GNU-specific extension. However the name + * is not part of the GNU specification, `strerror_r` should + * be used. It is defined to this function unless + * `(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE`. + * However it is not defined if _SLIBC_SOURCE is defined. + * + * @param errnum The error code. + * @param buf Buffer where the description shall be stored. + * @param buflen The allocation size of `buf`. + * @return `buf` on success, `NULL` on error. On error, `errno` + * is set to indicate the error. + * + * @throws ERANGE `buf` was too small to store the description. + */ +char* __gnu_strerror_r(int errnum, char* buf, size_t buflen) +{ + errno = __xsi_strerror_r(errnum, buf, buflen); + return errno ? NULL : buf; +} + diff --git a/src/string/strerror/strerror_r_xsi.c b/src/string/strerror/strerror_r_xsi.c new file mode 100644 index 0000000..70c3bc8 --- /dev/null +++ b/src/string/strerror/strerror_r_xsi.c @@ -0,0 +1,56 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * 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 . + */ +#include +#include + + + +/** + * Reenterant variant of `strerror`. + * + * This is an XSI-compliant extension. However the name + * is not part of the XSI specification, `strerror_r` + * should be used. It is defined to this function if + * `(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE`. + * However it is not defined if _SLIBC_SOURCE is defined. + * + * @param errnum The error code. + * @param buf Buffer where the description shall be stored. + * @param buflen The allocation size of `buf`. + * @return Zero on success, value for `errno` on error + * + * @throws ERANGE `buf` was too small to store the description. + */ +int __xsi_strerror_r(int errnum, char* buf, size_t buflen) +{ + char* description = strerror(errnum); + size_t length = strlen(description); + + if (buflen == 0) + return ERANGE; + + if (buflen <= length) + { + memcpy(buf, description, buflen - 1); + buf[buflen - 1] = 0; + return ERANGE; + } + + return memcpy(buf, description, length + 1), 0; +} + diff --git a/src/string/strerror_l.c b/src/string/strerror_l.c deleted file mode 100644 index 838040f..0000000 --- a/src/string/strerror_l.c +++ /dev/null @@ -1,44 +0,0 @@ -/** - * slibc — Yet another C library - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ -#include - - - -/** - * Return a textual representation of an error code. - * This error code must from `errno`. - * - * POSIX specifies `errno` may only be set on failure, - * and reserves no return value to indicate such. - * You should therefore, set `errno` to zero before calling - * this function, and inspect `errno` when it returns. - * - * The returned value must not be modified or freed. - * - * @param errnum The error code. - * @param locale The locale, must be a valid locale and not - * `LC_GLOBAL_LOCALE`, lest the behaviour is undefined. - * @return A description of the error. - */ -char* strerror_l(int errnum, locale_t locale) -{ - /* TODO implement strerror_l */ - return strerror(errnum); - (void) locale; -} - diff --git a/src/string/strerror_r_gnu.c b/src/string/strerror_r_gnu.c deleted file mode 100644 index 3e8bfd4..0000000 --- a/src/string/strerror_r_gnu.c +++ /dev/null @@ -1,45 +0,0 @@ -/** - * slibc — Yet another C library - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ -#include -#include - - - -/** - * Reenterant variant of `strerror`. - * - * This is a GNU-specific extension. However the name - * is not part of the GNU specification, `strerror_r` should - * be used. It is defined to this function unless - * `(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE`. - * However it is not defined if _SLIBC_SOURCE is defined. - * - * @param errnum The error code. - * @param buf Buffer where the description shall be stored. - * @param buflen The allocation size of `buf`. - * @return `buf` on success, `NULL` on error. On error, `errno` - * is set to indicate the error. - * - * @throws ERANGE `buf` was too small to store the description. - */ -char* __gnu_strerror_r(int errnum, char* buf, size_t buflen) -{ - errno = __xsi_strerror_r(errnum, buf, buflen); - return errno ? NULL : buf; -} - diff --git a/src/string/strerror_r_xsi.c b/src/string/strerror_r_xsi.c deleted file mode 100644 index 70c3bc8..0000000 --- a/src/string/strerror_r_xsi.c +++ /dev/null @@ -1,56 +0,0 @@ -/** - * slibc — Yet another C library - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * 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 . - */ -#include -#include - - - -/** - * Reenterant variant of `strerror`. - * - * This is an XSI-compliant extension. However the name - * is not part of the XSI specification, `strerror_r` - * should be used. It is defined to this function if - * `(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE`. - * However it is not defined if _SLIBC_SOURCE is defined. - * - * @param errnum The error code. - * @param buf Buffer where the description shall be stored. - * @param buflen The allocation size of `buf`. - * @return Zero on success, value for `errno` on error - * - * @throws ERANGE `buf` was too small to store the description. - */ -int __xsi_strerror_r(int errnum, char* buf, size_t buflen) -{ - char* description = strerror(errnum); - size_t length = strlen(description); - - if (buflen == 0) - return ERANGE; - - if (buflen <= length) - { - memcpy(buf, description, buflen - 1); - buf[buflen - 1] = 0; - return ERANGE; - } - - return memcpy(buf, description, length + 1), 0; -} - -- cgit v1.2.3-70-g09d2