From 12340f41085c5ab9f5f049eab640835e39de8286 Mon Sep 17 00:00:00 2001 From: "kay.sievers@vrfy.org" Date: Tue, 29 Mar 2005 03:53:45 +0200 Subject: [PATCH] [PATCH] klibc: version 1.0.5 --- klibc/klibc/strlcat.c | 3 +-- klibc/klibc/strlcpy.c | 4 +++- klibc/version | 2 +- udev_libc_wrapper.c | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/klibc/klibc/strlcat.c b/klibc/klibc/strlcat.c index fdd72ac39..f397857e7 100644 --- a/klibc/klibc/strlcat.c +++ b/klibc/klibc/strlcat.c @@ -26,8 +26,7 @@ size_t strlcat(char *dst, const char *src, size_t size) bytes++; } - if (size) - *q = '\0'; + *q = '\0'; return bytes; } diff --git a/klibc/klibc/strlcpy.c b/klibc/klibc/strlcpy.c index 9e7b6bf91..e6937445c 100644 --- a/klibc/klibc/strlcpy.c +++ b/klibc/klibc/strlcpy.c @@ -19,8 +19,10 @@ size_t strlcpy(char *dst, const char *src, size_t size) bytes++; } - if (size) + /* If size == 0 there is no space for a final null... */ + if ( size ) *q = '\0'; + return bytes; } diff --git a/klibc/version b/klibc/version index ee90284c2..90a27f9ce 100644 --- a/klibc/version +++ b/klibc/version @@ -1 +1 @@ -1.0.4 +1.0.5 diff --git a/udev_libc_wrapper.c b/udev_libc_wrapper.c index d69f2ac48..1852141c9 100644 --- a/udev_libc_wrapper.c +++ b/udev_libc_wrapper.c @@ -58,8 +58,10 @@ size_t strlcpy(char *dst, const char *src, size_t size) bytes++; } + /* If size == 0 there is no space for a final null... */ if (size) *q = '\0'; + return bytes; } @@ -83,8 +85,7 @@ size_t strlcat(char *dst, const char *src, size_t size) bytes++; } - if (size) - *q = '\0'; + *q = '\0'; return bytes; } #endif /* __OWN_STRLCPYCAT__ */ -- 2.30.2