diff -urN openrc-0.8.3.orig/src/libeinfo/libeinfo.c openrc-0.8.3/src/libeinfo/libeinfo.c --- openrc-0.8.3.orig/src/libeinfo/libeinfo.c 2011-06-20 04:37:55.000000000 +0200 +++ openrc-0.8.3/src/libeinfo/libeinfo.c 2011-07-13 22:34:46.000000000 +0200 @@ -196,60 +196,6 @@ }; #endif -/* strlcat and strlcpy are nice, shame glibc does not define them */ -#ifdef __GLIBC__ -# if ! defined (__UCLIBC__) && ! defined (__dietlibc__) -static size_t -strlcat(char *dst, const char *src, size_t size) -{ - char *d = dst; - const char *s = src; - size_t src_n = size; - size_t dst_n; - - while (src_n-- != 0 && *d != '\0') - d++; - dst_n = d - dst; - src_n = size - dst_n; - - if (src_n == 0) - return dst_n + strlen(src); - - while (*s != '\0') { - if (src_n != 1) { - *d++ = *s; - src_n--; - } - s++; - } - *d = '\0'; - - return dst_n + (s - src); -} - -static size_t -strlcpy(char *dst, const char *src, size_t size) -{ - const char *s = src; - size_t n = size; - - if (n && --n) - do { - if (!(*dst++ = *src++)) - break; - } while (--n); - - if (!n) { - if (size) - *dst = '\0'; - while (*src++); - } - - return src - s - 1; -} -# endif -#endif - static bool yesno(const char *value) {