Page MenuHomeFreeBSD
Files F160791782

D7581.diff
No OneTemporary
Actions

D7581.diff
View Options

Index: head/usr.sbin/cron/cron/cron.8
===================================================================
--- head/usr.sbin/cron/cron/cron.8
+++ head/usr.sbin/cron/cron/cron.8
@@ -17,7 +17,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 29, 2008
+.Dd August 21, 2016
.Dt CRON 8
.Os
.Sh NAME
@@ -28,6 +28,7 @@
.Op Fl j Ar jitter
.Op Fl J Ar rootjitter
.Op Fl m Ar mailto
+.Op Fl n
.Op Fl s
.Op Fl o
.Op Fl x Ar debugflag Ns Op , Ns Ar ...
@@ -132,6 +133,8 @@
.Li ''
or
.Li \*q\*q .
+.It Fl n
+Don't daemonize, run in foreground instead.
.It Fl s
Enable special handling of situations when the GMT offset of the local
timezone changes, such as the switches between the standard time and
Index: head/usr.sbin/cron/cron/cron.c
===================================================================
--- head/usr.sbin/cron/cron/cron.c
+++ head/usr.sbin/cron/cron/cron.c
@@ -49,6 +49,7 @@
static time_t last_time = 0;
static int dst_enabled = 0;
+static int dont_daemonize = 0;
struct pidfh *pfh;
static void
@@ -58,7 +59,7 @@
#endif
fprintf(stderr, "usage: cron [-j jitter] [-J rootjitter] "
- "[-m mailto] [-s] [-o] [-x debugflag[,...]]\n");
+ "[-m mailto] [-n ] [-s] [-o] [-x debugflag[,...]]\n");
#if DEBUGGING
fprintf(stderr, "\ndebugflags: ");
@@ -136,7 +137,7 @@
if (0) {
# endif
(void) fprintf(stderr, "[%d] cron started\n", getpid());
- } else {
+ } else if (dont_daemonize == 0) {
if (daemon(1, 0) == -1) {
pidfile_remove(pfh);
log_it("CRON",getpid(),"DEATH","can't become daemon");
@@ -512,7 +513,7 @@
int argch;
char *endp;
- while ((argch = getopt(argc, argv, "j:J:m:osx:")) != -1) {
+ while ((argch = getopt(argc, argv, "j:J:m:nosx:")) != -1) {
switch (argch) {
case 'j':
Jitter = strtoul(optarg, &endp, 10);
@@ -529,6 +530,9 @@
case 'm':
defmailto = optarg;
break;
+ case 'n':
+ dont_daemonize = 1;
+ break;
case 'o':
dst_enabled = 0;
break;

File Metadata

Mime Type
text/plain
Expires
Sun, Jun 28, 10:03 PM (11 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34444639
Default Alt Text
D7581.diff (1 KB)

Event Timeline