summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2005-03-29 03:53:45 +0200
committerGreg KH <gregkh@suse.de>2005-04-26 23:55:00 -0700
commit12340f41085c5ab9f5f049eab640835e39de8286 (patch)
treedb55f8dc668ccc60c0b407316222ad81ee949920
parentbb1a77d34cd004b44b30a79d7521957c3881e497 (diff)
[PATCH] klibc: version 1.0.5
-rw-r--r--klibc/klibc/strlcat.c3
-rw-r--r--klibc/klibc/strlcpy.c4
-rw-r--r--klibc/version2
-rw-r--r--udev_libc_wrapper.c5
4 files changed, 8 insertions, 6 deletions
diff --git a/klibc/klibc/strlcat.c b/klibc/klibc/strlcat.c
index fdd72ac392..f397857e76 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 9e7b6bf91f..e6937445cd 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 ee90284c27..90a27f9cea 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 d69f2ac48e..1852141c93 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__ */