Deleted Added
sdiff udiff text old ( 244986 ) new ( 255521 )
full compact
daemon.c (244986) daemon.c (255521)
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 244986 2013-01-03 00:49:11Z marius $");
32__FBSDID("$FreeBSD: head/usr.sbin/daemon/daemon.c 255521 2013-09-13 16:57:28Z jmg $");
33
34#include <sys/param.h>
35#include <sys/mman.h>
36#include <sys/wait.h>
37
38#include <err.h>
39#include <errno.h>
40#include <libutil.h>

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

48static void dummy_sighandler(int);
49static void restrict_process(const char *);
50static int wait_child(pid_t pid, sigset_t *mask);
51static void usage(void);
52
53int
54main(int argc, char *argv[])
55{
33
34#include <sys/param.h>
35#include <sys/mman.h>
36#include <sys/wait.h>
37
38#include <err.h>
39#include <errno.h>
40#include <libutil.h>

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

48static void dummy_sighandler(int);
49static void restrict_process(const char *);
50static int wait_child(pid_t pid, sigset_t *mask);
51static void usage(void);
52
53int
54main(int argc, char *argv[])
55{
56 struct pidfh *pfh = NULL;
56 struct pidfh *ppfh, *pfh;
57 sigset_t mask, oldmask;
58 int ch, nochdir, noclose, restart;
57 sigset_t mask, oldmask;
58 int ch, nochdir, noclose, restart;
59 const char *pidfile, *user;
59 const char *pidfile, *ppidfile, *user;
60 pid_t otherpid, pid;
61
62 nochdir = noclose = 1;
63 restart = 0;
60 pid_t otherpid, pid;
61
62 nochdir = noclose = 1;
63 restart = 0;
64 pidfile = user = NULL;
65 while ((ch = getopt(argc, argv, "cfp:ru:")) != -1) {
64 ppfh = pfh = NULL;
65 ppidfile = pidfile = user = NULL;
66 while ((ch = getopt(argc, argv, "cfp:P:ru:")) != -1) {
66 switch (ch) {
67 case 'c':
68 nochdir = 0;
69 break;
70 case 'f':
71 noclose = 0;
72 break;
73 case 'p':
74 pidfile = optarg;
75 break;
67 switch (ch) {
68 case 'c':
69 nochdir = 0;
70 break;
71 case 'f':
72 noclose = 0;
73 break;
74 case 'p':
75 pidfile = optarg;
76 break;
77 case 'P':
78 ppidfile = optarg;
79 break;
76 case 'r':
77 restart = 1;
78 break;
79 case 'u':
80 user = optarg;
81 break;
82 default:
83 usage();
84 }
85 }
86 argc -= optind;
87 argv += optind;
88
89 if (argc == 0)
90 usage();
91
80 case 'r':
81 restart = 1;
82 break;
83 case 'u':
84 user = optarg;
85 break;
86 default:
87 usage();
88 }
89 }
90 argc -= optind;
91 argv += optind;
92
93 if (argc == 0)
94 usage();
95
92 pfh = NULL;
96 ppfh = pfh = NULL;
93 /*
94 * Try to open the pidfile before calling daemon(3),
95 * to be able to report the error intelligently
96 */
97 if (pidfile != NULL) {
98 pfh = pidfile_open(pidfile, 0600, &otherpid);
99 if (pfh == NULL) {
100 if (errno == EEXIST) {
101 errx(3, "process already running, pid: %d",
102 otherpid);
103 }
104 err(2, "pidfile ``%s''", pidfile);
105 }
106 }
97 /*
98 * Try to open the pidfile before calling daemon(3),
99 * to be able to report the error intelligently
100 */
101 if (pidfile != NULL) {
102 pfh = pidfile_open(pidfile, 0600, &otherpid);
103 if (pfh == NULL) {
104 if (errno == EEXIST) {
105 errx(3, "process already running, pid: %d",
106 otherpid);
107 }
108 err(2, "pidfile ``%s''", pidfile);
109 }
110 }
111
112 /* do same for actual daemon process */
113 if (ppidfile != NULL) {
114 ppfh = pidfile_open(ppidfile, 0600, &otherpid);
115 if (ppfh == NULL) {
116 if (errno == EEXIST) {
117 errx(3, "process already running, pid: %d",
118 otherpid);
119 }
120 err(2, "ppidfile ``%s''", ppidfile);
121 }
122 }
107
108 if (daemon(nochdir, noclose) == -1)
109 err(1, NULL);
110
111 /*
112 * If the pidfile or restart option is specified the daemon
113 * executes the command in a forked process and wait on child
114 * exit to remove the pidfile or restart the command. Normally

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

171 execvp(argv[0], argv);
172
173 /*
174 * execvp() failed -- report the error. The child is
175 * now running, so the exit status doesn't matter.
176 */
177 err(1, "%s", argv[0]);
178 }
123
124 if (daemon(nochdir, noclose) == -1)
125 err(1, NULL);
126
127 /*
128 * If the pidfile or restart option is specified the daemon
129 * executes the command in a forked process and wait on child
130 * exit to remove the pidfile or restart the command. Normally

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

187 execvp(argv[0], argv);
188
189 /*
190 * execvp() failed -- report the error. The child is
191 * now running, so the exit status doesn't matter.
192 */
193 err(1, "%s", argv[0]);
194 }
195 /* write out parent pidfile if needed */
196 if (ppidfile != NULL)
197 pidfile_write(ppfh);
198
179 setproctitle("%s[%d]", argv[0], pid);
180 if (wait_child(pid, &mask) == 0 && restart) {
181 sleep(1);
182 goto restart;
183 }
184 pidfile_remove(pfh);
199 setproctitle("%s[%d]", argv[0], pid);
200 if (wait_child(pid, &mask) == 0 && restart) {
201 sleep(1);
202 goto restart;
203 }
204 pidfile_remove(pfh);
205 pidfile_remove(ppfh);
185 exit(0); /* Exit status does not matter. */
186}
187
188static void
189dummy_sighandler(int sig __unused)
190{
191 /* Nothing to do. */
192}

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

235 }
236 }
237}
238
239static void
240usage(void)
241{
242 (void)fprintf(stderr,
206 exit(0); /* Exit status does not matter. */
207}
208
209static void
210dummy_sighandler(int sig __unused)
211{
212 /* Nothing to do. */
213}

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

256 }
257 }
258}
259
260static void
261usage(void)
262{
263 (void)fprintf(stderr,
243 "usage: daemon [-cfr] [-p pidfile] [-u user] command "
244 "arguments ...\n");
264 "usage: daemon [-cfr] [-p child_pidfile] [-P supervisor_pidfile] "
265 "[-u user]\n command arguments ...\n");
245 exit(1);
246}
266 exit(1);
267}