dbus/dbus.patch@fa4856f209c2 (annotated)
dbus/dbus.patch
Thu, 08 Jan 2009 01:13:59 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 08 Jan 2009 01:13:59 +0100
- changeset 33
- fa4856f209c2
- child 76
- 11e79e472059
- permissions
- -rw-r--r--
Correct many embarassing errors for a project claiming portability.
| michael@12 | 1 | Index: dbus/dbus-internals.c |
| michael@12 | 2 | --- dbus/dbus-internals.c.orig 2006-11-17 20:12:18 +0100 |
| michael@12 | 3 | +++ dbus/dbus-internals.c 2006-11-18 12:35:56 +0100 |
| michael@12 | 4 | @@ -512,6 +512,14 @@ |
| michael@12 | 5 | uuid->as_uint32s[DBUS_UUID_LENGTH_WORDS - 1] = DBUS_UINT32_TO_BE (now); |
| michael@12 | 6 | |
| michael@12 | 7 | _dbus_generate_random_bytes_buffer (uuid->as_bytes, DBUS_UUID_LENGTH_BYTES - 4); |
| michael@12 | 8 | + |
| michael@12 | 9 | + /* brand UUID as variant DCE 1.1 */ |
| michael@12 | 10 | + uuid->as_bytes[8] &= ~0xc0; |
| michael@12 | 11 | + uuid->as_bytes[8] |= (0x02 << 6); |
| michael@12 | 12 | + |
| michael@12 | 13 | + /* brand UUID as version 4 */ |
| michael@12 | 14 | + uuid->as_bytes[6] &= ~0xf0; |
| michael@12 | 15 | + uuid->as_bytes[6] |= (0x04 << 4); |
| michael@12 | 16 | } |
| michael@12 | 17 | |
| michael@12 | 18 | /** |
| michael@12 | 19 | Index: dbus/dbus-sysdeps-util-unix.c |
| michael@12 | 20 | --- dbus/dbus-sysdeps-util-unix.c.orig 2006-11-02 20:19:08 +0100 |
| michael@12 | 21 | +++ dbus/dbus-sysdeps-util-unix.c 2006-11-18 12:33:22 +0100 |
| michael@12 | 22 | @@ -31,6 +31,7 @@ |
| michael@12 | 23 | #include "dbus-test.h" |
| michael@12 | 24 | |
| michael@12 | 25 | #include <sys/types.h> |
| michael@12 | 26 | +#include <sys/param.h> |
| michael@12 | 27 | #include <stdlib.h> |
| michael@12 | 28 | #include <string.h> |
| michael@12 | 29 | #include <signal.h> |
| michael@12 | 30 | @@ -526,6 +527,8 @@ |
| michael@12 | 31 | # else |
| michael@12 | 32 | # if defined(NAME_MAX) |
| michael@12 | 33 | name_max = NAME_MAX; |
| michael@12 | 34 | +# elif defined(MAXPATHLEN) |
| michael@12 | 35 | + name_max = MAXPATHLEN; |
| michael@12 | 36 | # else |
| michael@12 | 37 | # error "buffer size for readdir_r cannot be determined" |
| michael@12 | 38 | # endif |
