Tue May 7 15:18:35 2013 UTC ()
include stdint.h before rumpuser.h (on some platforms it doesn't get
there automagically)


(pooka)
diff -r1.5 -r1.6 src/lib/librumpuser/rumpuser_bio.c
diff -r1.5 -r1.6 src/lib/librumpuser/rumpuser_component.c
diff -r1.5 -r1.6 src/lib/librumpuser/rumpuser_daemonize.c
cvs diff -r1.5 -r1.6 src/lib/librumpuser/rumpuser_bio.c (expand / switch to unified diff)

--- src/lib/librumpuser/rumpuser_bio.c 2013/04/29 14:54:03 1.5
+++ src/lib/librumpuser/rumpuser_bio.c 2013/05/07 15:18:35 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: rumpuser_bio.c,v 1.5 2013/04/29 14:54:03 pooka Exp $ */ 1/* $NetBSD: rumpuser_bio.c,v 1.6 2013/05/07 15:18:35 pooka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 Antti Kantee. All Rights Reserved. 4 * Copyright (c) 2013 Antti Kantee. All Rights Reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -22,26 +22,27 @@ @@ -22,26 +22,27 @@
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE. 25 * SUCH DAMAGE.
26 */ 26 */
27 27
28#include "rumpuser_port.h" 28#include "rumpuser_port.h"
29 29
30#include <sys/types.h> 30#include <sys/types.h>
31 31
32#include <assert.h> 32#include <assert.h>
33#include <errno.h> 33#include <errno.h>
34#include <pthread.h> 34#include <pthread.h>
 35#include <stdint.h>
35#include <stdio.h> 36#include <stdio.h>
36#include <string.h> 37#include <string.h>
37#include <unistd.h> 38#include <unistd.h>
38 39
39#include <rump/rumpuser.h> 40#include <rump/rumpuser.h>
40 41
41#include "rumpuser_int.h" 42#include "rumpuser_int.h"
42 43
43struct rumpuser_bio { 44struct rumpuser_bio {
44 int bio_fd; 45 int bio_fd;
45 int bio_op; 46 int bio_op;
46 void *bio_data; 47 void *bio_data;
47 size_t bio_dlen; 48 size_t bio_dlen;
cvs diff -r1.5 -r1.6 src/lib/librumpuser/rumpuser_component.c (expand / switch to unified diff)

--- src/lib/librumpuser/rumpuser_component.c 2013/04/30 12:39:20 1.5
+++ src/lib/librumpuser/rumpuser_component.c 2013/05/07 15:18:35 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: rumpuser_component.c,v 1.5 2013/04/30 12:39:20 pooka Exp $ */ 1/* $NetBSD: rumpuser_component.c,v 1.6 2013/05/07 15:18:35 pooka Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2013 Antti Kantee. All Rights Reserved. 4 * Copyright (c) 2013 Antti Kantee. All Rights Reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -18,29 +18,31 @@ @@ -18,29 +18,31 @@
18 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 18 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE. 25 * SUCH DAMAGE.
26 */ 26 */
27 27
28#include "rumpuser_port.h" 28#include "rumpuser_port.h"
29 29
30#if !defined(lint) 30#if !defined(lint)
31__RCSID("$NetBSD: rumpuser_component.c,v 1.5 2013/04/30 12:39:20 pooka Exp $"); 31__RCSID("$NetBSD: rumpuser_component.c,v 1.6 2013/05/07 15:18:35 pooka Exp $");
32#endif /* !lint */ 32#endif /* !lint */
33 33
 34#include <stdint.h>
 35
34/* 36/*
35 * These interfaces affect the shlib major/minor; they can be called from 37 * These interfaces affect the shlib major/minor; they can be called from
36 * any program when applicable. The rest of the interfaces provided 38 * any program when applicable. The rest of the interfaces provided
37 * by rumpuser are part of the rump kernel/hypervisor contract and 39 * by rumpuser are part of the rump kernel/hypervisor contract and
38 * are versioned by RUMPUSER_VERSION. 40 * are versioned by RUMPUSER_VERSION.
39 */ 41 */
40 42
41#include <rump/rumpuser_component.h> 43#include <rump/rumpuser_component.h>
42 44
43#include "rumpuser_int.h" 45#include "rumpuser_int.h"
44 46
45void * 47void *
46rumpuser_component_unschedule(void) 48rumpuser_component_unschedule(void)
cvs diff -r1.5 -r1.6 src/lib/librumpuser/rumpuser_daemonize.c (expand / switch to unified diff)

--- src/lib/librumpuser/rumpuser_daemonize.c 2013/04/30 12:39:20 1.5
+++ src/lib/librumpuser/rumpuser_daemonize.c 2013/05/07 15:18:35 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: rumpuser_daemonize.c,v 1.5 2013/04/30 12:39:20 pooka Exp $ */ 1/* $NetBSD: rumpuser_daemonize.c,v 1.6 2013/05/07 15:18:35 pooka Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2010 Antti Kantee. All Rights Reserved. 4 * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -18,34 +18,35 @@ @@ -18,34 +18,35 @@
18 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 18 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE. 25 * SUCH DAMAGE.
26 */ 26 */
27 27
28#include "rumpuser_port.h" 28#include "rumpuser_port.h"
29 29
30#if !defined(lint) 30#if !defined(lint)
31__RCSID("$NetBSD: rumpuser_daemonize.c,v 1.5 2013/04/30 12:39:20 pooka Exp $"); 31__RCSID("$NetBSD: rumpuser_daemonize.c,v 1.6 2013/05/07 15:18:35 pooka Exp $");
32#endif /* !lint */ 32#endif /* !lint */
33 33
34#include <sys/types.h> 34#include <sys/types.h>
35#include <sys/socket.h> 35#include <sys/socket.h>
36 36
37#include <errno.h> 37#include <errno.h>
38#include <fcntl.h> 38#include <fcntl.h>
 39#include <stdint.h>
39#include <stdio.h> 40#include <stdio.h>
40#include <unistd.h> 41#include <unistd.h>
41 42
42#include "rumpuser_int.h" 43#include "rumpuser_int.h"
43 44
44#ifdef __sun__ 45#ifdef __sun__
45#define _PATH_DEVNULL "/dev/null" 46#define _PATH_DEVNULL "/dev/null"
46#else 47#else
47#include <paths.h> 48#include <paths.h>
48#endif 49#endif
49 50
50static int isdaemonizing; 51static int isdaemonizing;
51static int daemonpipe[2]; 52static int daemonpipe[2];