summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2014-02-26 14:08:19 +0100
committerJustus Winter <4winter@informatik.uni-hamburg.de>2014-02-26 14:08:19 +0100
commit60c3e63048b8902aded608a1613a4384afd7ae41 (patch)
tree852370858511536cb1ea0df5f16f9386deb301fc /debian
parentfa6b34e3548859531b3928ea301ccb6444a15422 (diff)
rm fix-mig_strncpy.patch
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/fix-mig_strncpy.patch49
-rw-r--r--debian/patches/series2
2 files changed, 1 insertions, 50 deletions
diff --git a/debian/patches/fix-mig_strncpy.patch b/debian/patches/fix-mig_strncpy.patch
deleted file mode 100644
index 932e8b1..0000000
--- a/debian/patches/fix-mig_strncpy.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit fbad2b61020cccb8afa26968690e02bb62d1cc78
-Author: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Fri Feb 21 21:57:37 2014 +0100
-
- kern: fix mig_strncpy
-
- Previously, the function mig_strncpy would always zero-terminate the
- destination string. Make mig_strncpy behave like mig_strncpy and
- strncpy in the glibc. Also fix the implementation of mig_strncpy to
- return the length of the written string to align the implementation
- with the declaration in include/mach/mig_support.h.
-
- * kern/ipc_mig.c (mig_strncpy): Do not zero-terminate the destination
- string. Return length of destination string.
-
-diff --git a/kern/ipc_mig.c b/kern/ipc_mig.c
-index bbc38cf..a52dcb9 100644
---- a/kern/ipc_mig.c
-+++ b/kern/ipc_mig.c
-@@ -285,22 +285,23 @@ mig_put_reply_port(
- *
- * len - Length of destination buffer.
- */
--void mig_strncpy(dest, src, len)
-+vm_size_t
-+mig_strncpy(dest, src, len)
- char *dest;
- const char *src;
- int len;
- {
-+ char *dest_ = dest;
- int i;
-
- if (len <= 0)
-- return;
-+ return 0;
-
-- for (i=1; i<len; i++)
-+ for (i=0; i<len; i++)
- if (! (*dest++ = *src++))
-- return;
-+ break;
-
-- *dest = '\0';
-- return;
-+ return dest - dest_;
- }
-
- #define fast_send_right_lookup(name, port, abort) \
diff --git a/debian/patches/series b/debian/patches/series
index a32e260..6b215aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,4 @@
60_bigmem.patch
70_dde.patch
protected_payload.patch
-fix-mig_strncpy.patch
+