Deleted Added
sdiff udiff text old ( 129983 ) new ( 149424 )
full compact
daemon.c (129983) daemon.c (149424)
1/*-
2 * Copyright (c) 1999 Berkeley Software Design, Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 15 unchanged lines hidden (view full) ---

24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * From BSDI: daemon.c,v 1.2 1996/08/15 01:11:09 jch Exp
29 */
30
31#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1999 Berkeley Software Design, Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 15 unchanged lines hidden (view full) ---

24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * From BSDI: daemon.c,v 1.2 1996/08/15 01:11:09 jch Exp
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/usr.sbin/daemon/daemon.c 129983 2004-06-02 06:48:13Z phk $");
32__FBSDID("$FreeBSD: head/usr.sbin/daemon/daemon.c 149424 2005-08-24 17:24:39Z pjd $");
33
33
34#include <sys/types.h>
34#include <sys/param.h>
35
36#include <err.h>
37#include <errno.h>
35
36#include <err.h>
37#include <errno.h>
38#include <libutil.h>
38#include <stdio.h>
39#include <stdlib.h>
40#include <unistd.h>
41
42static void usage(void);
43
44int
45main(int argc, char *argv[])
46{
39#include <stdio.h>
40#include <stdlib.h>
41#include <unistd.h>
42
43static void usage(void);
44
45int
46main(int argc, char *argv[])
47{
48 struct pidfh *pfh;
47 int ch, nochdir, noclose, errcode;
49 int ch, nochdir, noclose, errcode;
48 FILE *pidf;
49 const char *pidfile;
50 const char *pidfile;
51 pid_t otherpid;
50
51 nochdir = noclose = 1;
52 pidfile = NULL;
53 while ((ch = getopt(argc, argv, "-cfp:")) != -1) {
54 switch (ch) {
55 case 'c':
56 nochdir = 0;
57 break;

--- 12 unchanged lines hidden (view full) ---

70
71 if (argc == 0)
72 usage();
73 /*
74 * Try to open the pidfile before calling daemon(3),
75 * to be able to report the error intelligently
76 */
77 if (pidfile) {
52
53 nochdir = noclose = 1;
54 pidfile = NULL;
55 while ((ch = getopt(argc, argv, "-cfp:")) != -1) {
56 switch (ch) {
57 case 'c':
58 nochdir = 0;
59 break;

--- 12 unchanged lines hidden (view full) ---

72
73 if (argc == 0)
74 usage();
75 /*
76 * Try to open the pidfile before calling daemon(3),
77 * to be able to report the error intelligently
78 */
79 if (pidfile) {
78 pidf = fopen(pidfile, "w");
79 if (pidf == NULL)
80 pfh = pidfile_open(pidfile, 0600, &otherpid);
81 if (pfh == NULL) {
82 if (errno == EEXIST) {
83 errx(3, "process already running, pid: %d",
84 otherpid);
85 }
80 err(2, "pidfile ``%s''", pidfile);
86 err(2, "pidfile ``%s''", pidfile);
87 }
81 }
82
83 if (daemon(nochdir, noclose) == -1)
84 err(1, NULL);
85
86 /* Now that we are the child, write out the pid */
88 }
89
90 if (daemon(nochdir, noclose) == -1)
91 err(1, NULL);
92
93 /* Now that we are the child, write out the pid */
87 if (pidfile) {
88 fprintf(pidf, "%lu\n", (unsigned long)getpid());
89 fclose(pidf);
90 }
94 if (pidfile)
95 pidfile_write(pfh);
91
92 execvp(argv[0], argv);
93
94 /*
95 * execvp() failed -- unlink pidfile if any, and
96 * report the error
97 */
98 errcode = errno; /* Preserve errcode -- unlink may reset it */
99 if (pidfile)
96
97 execvp(argv[0], argv);
98
99 /*
100 * execvp() failed -- unlink pidfile if any, and
101 * report the error
102 */
103 errcode = errno; /* Preserve errcode -- unlink may reset it */
104 if (pidfile)
100 unlink(pidfile);
105 pidfile_remove(pfh);
101
102 /* The child is now running, so the exit status doesn't matter. */
103 errc(1, errcode, "%s", argv[0]);
104}
105
106static void
107usage(void)
108{
109 (void)fprintf(stderr,
110 "usage: daemon [-cf] [-p pidfile] command arguments ...\n");
111 exit(1);
112}
106
107 /* The child is now running, so the exit status doesn't matter. */
108 errc(1, errcode, "%s", argv[0]);
109}
110
111static void
112usage(void)
113{
114 (void)fprintf(stderr,
115 "usage: daemon [-cf] [-p pidfile] command arguments ...\n");
116 exit(1);
117}