github/amiga-clib2
1
0
Fork 0
mirror of https://github.com/adtools/clib2.git synced 2025-12-08 14:59:05 +00:00
Code Issues Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@15134 87f5fb63-7c3d-0410-a384-fd976d0f7a62
This commit is contained in:
Olaf Barthel
2006-09-17 17:36:42 +00:00
parent 8aeb5072ab
commit aa3240972a
5 changed files with 235 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/GNUmakefile.68k
View File

@@ -1,5 +1,5 @@
# #
# $Id: GNUmakefile.68k,v 1.95 2006-09-15 06:58:16 obarthel Exp $ # $Id: GNUmakefile.68k,v 1.96 2006-09-17 17:36:42 obarthel Exp $
# #
# :ts=8 # :ts=8
# #
@@ -388,6 +388,7 @@ C_LIB = \
string_strcspn.o \ string_strcspn.o \
string_strdup.o \ string_strdup.o \
string_strerror.o \ string_strerror.o \
string_strerror_r.o \
string_strlcat.o \ string_strlcat.o \
string_strlcpy.o \ string_strlcpy.o \
string_strlen.o \ string_strlen.o \

5
library/changes
View File

@@ -1,3 +1,8 @@
- Integrated the new OS4 build makefile collection, as contributed by
Steven Solie. Thank you very much!
- Added the missing strerror_r() function.
- fpathconf() should work with the stdio streams, even in the thread-safe - fpathconf() should work with the stdio streams, even in the thread-safe
library version, again. library version, again.

3
library/include/string.h
View File

@@ -1,5 +1,5 @@
/* /*
* $Id: string.h,v 1.11 2006-01-08 12:06:14 obarthel Exp $ * $Id: string.h,v 1.12 2006-09-17 17:36:42 obarthel Exp $
* *
* :ts=4 * :ts=4
* *
@@ -106,6 +106,7 @@ extern void *memset(void *ptr, int val, size_t len);
/****************************************************************************/ /****************************************************************************/
extern int strerror_r(int error,char * buffer,size_t buffer_size);
extern char * index(const char *s, int c); extern char * index(const char *s, int c);
extern char * rindex(const char *s, int c); extern char * rindex(const char *s, int c);

150
library/string_strerror.c
View File

@@ -1,5 +1,5 @@
/* /*
* $Id: string_strerror.c,v 1.3 2006-01-08 12:04:27 obarthel Exp $ * $Id: string_strerror.c,v 1.4 2006-09-17 17:36:42 obarthel Exp $
* *
* :ts=4 * :ts=4
* *
@@ -37,123 +37,27 @@
/****************************************************************************/ /****************************************************************************/
static char * error_table[EILSEQ - EPERM + 1] = static void
number_to_string(int number,char * string,size_t string_size)
{ {
"Operation not permitted",
"No such file or directory",
"No such process",
"Interrupted system call",
"Input/output error",
"Device not configured",
"Argument list too long",
"Exec format error",
"Bad file descriptor",
"No child processes",
"Resource deadlock avoided",
"Cannot allocate memory",
"Permission denied",
"Bad address",
"Block device required",
"Device busy",
"File exists",
"Cross-device link",
"Operation not supported by device",
"Not a directory",
"Is a directory",
"Invalid argument",
"Too many open files in system",
"Too many open files",
"Inappropriate ioctl for device",
"Text file busy",
"File too large",
"No space left on device",
"Illegal seek",
"Read-only file system",
"Too many links",
"Broken pipe",
"Numerical argument out of domain",
"Result too large",
"Resource temporarily unavailable",
"Operation now in progress",
"Operation already in progress",
"Socket operation on non-socket",
"Destination address required",
"Message too long",
"Protocol wrong type for socket",
"Protocol not available",
"Protocol not supported",
"Socket type not supported",
"Operation not supported on socket",
"Protocol family not supported",
"Address family not supported by protocol family",
"Address already in use",
"Can't assign requested address",
"Network is down",
"Network is unreachable",
"Network dropped connection on reset",
"Software caused connection abort",
"Connection reset by peer",
"No buffer space available",
"Socket is already connected",
"Socket is not connected",
"Can't send after socket shutdown",
"Too many references: can't splice",
"Connection timed out",
"Connection refused",
"Too many levels of symbolic links",
"File name too long",
"Host is down",
"No route to host",
"Directory not empty",
"Too many processes",
"Too many users",
"Disc quota exceeded",
"Stale NFS file handle",
"Too many levels of remote in path",
"RPC struct is bad",
"RPC version wrong",
"RPC program not available",
"Program version wrong",
"Bad procedure for program",
"No locks available",
"Function not implemented",
"Inappropriate file type or format",
"Authentication error",
"Need authenticator",
"Identifier removed",
"No message of the desired type.",
"Value too large to be stored in data type.",
"Encoding error detected"
};
/****************************************************************************/
char *
strerror(int error_number)
{
char * result;
if(error_number < EPERM || error_number > EILSEQ)
{
static char error_buffer[80];
char number[30];
char *s = number;
int is_negative = 0; int is_negative = 0;
char * s = string;
unsigned int n; unsigned int n;
int i,len,c; size_t i,len;
char c;
/* We convert the error number into in an unsigned /* We convert the error number into in an unsigned
integer, so that numbers such as 0x80000000 integer, so that numbers such as 0x80000000
can come out of the conversion. */ can come out of the conversion. */
if(error_number < 0) if(number < 0)
{ {
is_negative = 1; is_negative = 1;
n = (-error_number); n = (-number);
} }
else else
{ {
n = error_number; n = number;
} }
/* Convert the error number into a string of digits. */ /* Convert the error number into a string of digits. */
@@ -165,10 +69,10 @@ strerror(int error_number)
n /= 10; n /= 10;
len++; len++;
} }
while(n > 0 && len < (int)sizeof(number)-1); while(n > 0 && len < string_size-1);
/* Add the sign, if necessary. */ /* Add the sign, if necessary. */
if(is_negative && len < (int)sizeof(number)-1) if(is_negative && len < string_size-1)
{ {
(*s++) = '-'; (*s++) = '-';
len++; len++;
@@ -179,20 +83,32 @@ strerror(int error_number)
/* Reverse the string in place. */ /* Reverse the string in place. */
for(i = 0 ; i < len / 2 ; i++) for(i = 0 ; i < len / 2 ; i++)
{ {
c = number[len-1-i]; c = string[len-1-i];
number[len-1-i] = number[i]; string[len-1-i] = string[i];
number[i] = c; string[i] = c;
}
} }
strcpy(error_buffer,"Unknown error "); /****************************************************************************/
strcat(error_buffer,number);
result = error_buffer; char *
} strerror(int error_number)
else
{ {
result = error_table[error_number - EPERM]; static char error_message[80];
/* NOTE: We are making the assumption that if strerror_r() fails, it
will fail only because the error code is unknown, and not
because the size of the supplied buffer is too small. */
if(strerror_r(error_number,error_message,sizeof(error_message)) != 0)
{
char number[20];
number_to_string(error_number,number,sizeof(number));
strcpy(error_message,"Unknown error ");
strcat(error_message,number);
} }
return(result); return(error_message);
} }

164
library/string_strerror_r.c Normal file
View File

@@ -0,0 +1,164 @@
/*
* $Id: string_strerror_r.c,v 1.1 2006-09-17 17:36:42 obarthel Exp $
*
* :ts=4
*
* Portable ISO 'C' (1994) runtime library for the Amiga computer
* Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
* 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.
*
* - Neither the name of Olaf Barthel nor the names of contributors
* may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
*/
#ifndef _STRING_HEADERS_H
#include "string_headers.h"
#endif /* _STRING_HEADERS_H */
#ifndef _STDLIB_HEADERS_H
#include "stdlib_headers.h"
#endif /* _STDLIB_HEADERS_H */
/****************************************************************************/
static char * error_table[EILSEQ - EPERM + 1] =
{
"Operation not permitted",
"No such file or directory",
"No such process",
"Interrupted system call",
"Input/output error",
"Device not configured",
"Argument list too long",
"Exec format error",
"Bad file descriptor",
"No child processes",
"Resource deadlock avoided",
"Cannot allocate memory",
"Permission denied",
"Bad address",
"Block device required",
"Device busy",
"File exists",
"Cross-device link",
"Operation not supported by device",
"Not a directory",
"Is a directory",
"Invalid argument",
"Too many open files in system",
"Too many open files",
"Inappropriate ioctl for device",
"Text file busy",
"File too large",
"No space left on device",
"Illegal seek",
"Read-only file system",
"Too many links",
"Broken pipe",
"Numerical argument out of domain",
"Result too large",
"Resource temporarily unavailable",
"Operation now in progress",
"Operation already in progress",
"Socket operation on non-socket",
"Destination address required",
"Message too long",
"Protocol wrong type for socket",
"Protocol not available",
"Protocol not supported",
"Socket type not supported",
"Operation not supported on socket",
"Protocol family not supported",
"Address family not supported by protocol family",
"Address already in use",
"Can't assign requested address",
"Network is down",
"Network is unreachable",
"Network dropped connection on reset",
"Software caused connection abort",
"Connection reset by peer",
"No buffer space available",
"Socket is already connected",
"Socket is not connected",
"Can't send after socket shutdown",
"Too many references: can't splice",
"Connection timed out",
"Connection refused",
"Too many levels of symbolic links",
"File name too long",
"Host is down",
"No route to host",
"Directory not empty",
"Too many processes",
"Too many users",
"Disc quota exceeded",
"Stale NFS file handle",
"Too many levels of remote in path",
"RPC struct is bad",
"RPC version wrong",
"RPC program not available",
"Program version wrong",
"Bad procedure for program",
"No locks available",
"Function not implemented",
"Inappropriate file type or format",
"Authentication error",
"Need authenticator",
"Identifier removed",
"No message of the desired type.",
"Value too large to be stored in data type.",
"Encoding error detected"
};
/****************************************************************************/
int
strerror_r(int number,char * buffer,size_t buffer_size)
{
int result = -1;
char * str;
size_t len;
if(number < EPERM || number > EILSEQ)
{
__set_errno(EINVAL);
goto out;
}
str = error_table[number - EPERM];
len = strlen(str);
if(len >= buffer_size)
{
__set_errno(ERANGE);
goto out;
}
strcpy(buffer,str);
result = 0;
out:
return(result);
}