diff --git a/lib/com_err/Makefile.in b/lib/com_err/Makefile.in index 45c4a9461..897f828c2 100644 --- a/lib/com_err/Makefile.in +++ b/lib/com_err/Makefile.in @@ -38,6 +38,7 @@ build_symlink_command = @build_symlink_command@ install_symlink_command = @install_symlink_command@ LIBNAME = $(LIBPREFIX)com_err +#LIBEXT = a Always build archive library! LIBEXT = @LIBEXT@ SHLIBEXT = @SHLIBEXT@ LIBPREFIX = @LIBPREFIX@ @@ -49,8 +50,8 @@ include_HEADERS = com_right.h com_err.h SOURCES = error.c com_err.c compile_et.c OBJECTS = error.o com_err.o $(LIBADD) -EXTRA_SOURCES = snprintf.c strcpy_truncate.c strcat_truncate.c -LIBADD = snprintf.o strcpy_truncate.o strcat_truncate.o +EXTRA_SOURCES = +LIBADD = all: $(lib_LIBRARIES) $(bin_PROGRAMS) $(include_HEADERS) diff --git a/lib/com_err/com_err.c b/lib/com_err/com_err.c index 369db7b9e..e420c50c7 100644 --- a/lib/com_err/com_err.c +++ b/lib/com_err/com_err.c @@ -54,11 +54,12 @@ error_message (long code) { static char msg[128]; const char *p = com_right(_et_list, code); - if(p == NULL) + if (p == NULL) p = strerror(code); - if(p != NULL && *p != '\0') - strcpy_truncate(msg, p, sizeof(msg)); - else + if (p != NULL && *p != '\0') { + strncpy(msg, p, sizeof(msg)); + msg[sizeof(msg)] = 0; + } else sprintf(msg, "Unknown error %ld", code); return msg; } diff --git a/lib/com_err/roken_rename.h b/lib/com_err/roken_rename.h index f3744bee1..3224cd331 100644 --- a/lib/com_err/roken_rename.h +++ b/lib/com_err/roken_rename.h @@ -41,23 +41,4 @@ #ifndef __roken_rename_h__ #define __roken_rename_h__ -#ifndef HAVE_ASNPRINTF -#define asnprintf _com_err_asnprintf -#endif -#ifndef HAVE_ASPRINTF -#define asprintf _com_err_asprintf -#endif -#ifndef HAVE_SNPRINTF -#define snprintf _com_err_snprintf -#endif -#ifndef HAVE_VASNPRINTF -#define vasnprintf _com_err_vasnprintf -#endif -#ifndef HAVE_VASPRINTF -#define vasprintf _com_err_vasprintf -#endif -#ifndef HAVE_VSNPRINTF -#define vsnprintf _com_err_vsnprintf -#endif - #endif /* __roken_rename_h__ */