summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-06-01 19:02:30 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-06-01 19:02:30 +0000
commit7d56735bc74dfeb5f60fe9ff9aec332a1f5f40cb (patch)
tree7f50a29ff09032e7dafaf1cda62b4f5f7cda9c61
parent2c4919ef0a9d14582a45bff234cea134a49ceaf9 (diff)
downloaddrakx-7d56735bc74dfeb5f60fe9ff9aec332a1f5f40cb.tar
drakx-7d56735bc74dfeb5f60fe9ff9aec332a1f5f40cb.tar.gz
drakx-7d56735bc74dfeb5f60fe9ff9aec332a1f5f40cb.tar.bz2
drakx-7d56735bc74dfeb5f60fe9ff9aec332a1f5f40cb.tar.xz
drakx-7d56735bc74dfeb5f60fe9ff9aec332a1f5f40cb.zip
- have strncat behave the same way as in glibc
- declare that we're using the DIETLIBC in include/stdlib.h, so I can change my mind in "dns.c" to handle broken glibc which is not capable of doing name resolution with a static binary
-rw-r--r--mdk-stage1/dietlibc/include/stdlib.h2
-rw-r--r--mdk-stage1/dietlibc/lib/strncat.c7
2 files changed, 8 insertions, 1 deletions
diff --git a/mdk-stage1/dietlibc/include/stdlib.h b/mdk-stage1/dietlibc/include/stdlib.h
index 800a80d10..1ec15e145 100644
--- a/mdk-stage1/dietlibc/include/stdlib.h
+++ b/mdk-stage1/dietlibc/include/stdlib.h
@@ -4,6 +4,8 @@
#include <sys/cdefs.h>
#include <sys/types.h>
+#define __LIBC_DIETLIBC__
+
void *calloc(size_t nmemb, size_t size) __THROW;
void *malloc(size_t size) __THROW;
void free(void *ptr) __THROW;
diff --git a/mdk-stage1/dietlibc/lib/strncat.c b/mdk-stage1/dietlibc/lib/strncat.c
index 21e2be326..a08e97916 100644
--- a/mdk-stage1/dietlibc/lib/strncat.c
+++ b/mdk-stage1/dietlibc/lib/strncat.c
@@ -1,17 +1,23 @@
#include "dietfeatures.h"
#include <string.h>
+#ifdef WANT_NON_COMPLIANT_STRNCAT
/* this implementation is not standards compliant.
* the standard says that strncat(dest,"foobar",3) should write 'f', 'o'
* and 'o'. The programmer is then expected to overwrite the last byte
* with '\0', which is often forgotten. This implementation makes sure
* the last written bytes is always '\0'. */
+#endif
char *strncat(char *s, const char *t, size_t n) {
char *dest=s;
register char *max;
s+=strlen(s);
+#ifdef WANT_NON_COMPLIANT_STRNCAT
max=s+n-1;
+#else
+ max=s+n;
+#endif
for (;;) {
if (!(*s = *t)) break; if (++s==max) break; ++t;
#ifndef WANT_SMALL_STRING_ROUTINES
@@ -23,4 +29,3 @@ char *strncat(char *s, const char *t, size_t n) {
*s=0;
return dest;
}
-