2006-03-30 Martin Hunt <hunt@redhat.com>

	* emul.h (kmalloc_node): New.

2 files changed, 35 insertions, 0 deletions

diff --git a/runtime/user/ChangeLog b/runtime/user/ChangeLog
index 82585425..e6c5ab32 100644
--- a/runtime/user/ChangeLog
+++ b/runtime/user/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-30  Martin Hunt  <hunt@redhat.com>
+
+	* emul.h (kmalloc_node): New.
+
 2006-01-25  Martin Hunt  <hunt@redhat.com>
 
 	* alloc.c (_stp_alloc_percpu): New function.
diff --git a/runtime/user/emul.h b/runtime/user/emul.h
index aa5479d4..63938b08 100644
--- a/runtime/user/emul.h
+++ b/runtime/user/emul.h
@@ -1,4 +1,6 @@
 #define kmalloc(size,flags) malloc(size)
+#define kmalloc(size,flags) malloc(size)
+#define kmalloc_node(size,flags,cpu) malloc(size)
 
 #define kfree(ptr) free(ptr)
 
@@ -88,3 +90,32 @@ void __lockfunc _spin_lock(spinlock_t *lock)
 void __lockfunc _spin_unlock(spinlock_t *lock)
 {
 }
+
+size_t strlcat(char *dest, const char *src, size_t count)
+{
+	size_t dsize = strlen(dest);
+	size_t len = strlen(src);
+	size_t res = dsize + len;
+
+	/* This would be a bug */
+	BUG_ON(dsize >= count);
+
+	dest += dsize;
+	count -= dsize;
+	if (len >= count)
+		len = count-1;
+	memcpy(dest, src, len);
+	dest[len] = 0;
+	return res;
+}
+size_t strlcpy(char *dest, const char *src, size_t size)
+{
+	size_t ret = strlen(src);
+
+	if (size) {
+		size_t len = (ret >= size) ? size - 1 : ret;
+		memcpy(dest, src, len);
+		dest[len] = '\0';
+	}
+	return ret;
+}