Page MenuHomeFreeBSD
Files F166216968

D20983.id59864.diff
No OneTemporary
Actions

D20983.id59864.diff
View Options

Index: usr.sbin/daemon/daemon.c
===================================================================
--- usr.sbin/daemon/daemon.c
+++ usr.sbin/daemon/daemon.c
@@ -101,28 +101,8 @@
outfn = NULL;
title = NULL;
mask = -1;
- while ((ch = getopt(argc, argv, "M:P:R:ST:cfl:m:o:p:rs:t:u:")) != -1) {
+ while ((ch = getopt(argc, argv, "cfSp:P:ru:o:s:l:t:l:m:M:R:T:")) != -1) {
switch (ch) {
- case 'M':
- mask = strtol(optarg, &p, 0);
- if (p == optarg || mask < 0 || mask > 0777)
- errx(6, "unrecognized umask");
- break;
- case 'P':
- ppidfile = optarg;
- break;
- case 'R':
- restart = strtol(optarg, &p, 0);
- if (p == optarg || restart < 1)
- errx(6, "invalid restart delay");
- break;
- case 'S':
- dosyslog = 1;
- break;
- case 'T':
- logtag = optarg;
- dosyslog = 1;
- break;
case 'c':
nochdir = 0;
break;
@@ -146,18 +126,38 @@
case 'p':
pidfile = optarg;
break;
+ case 'P':
+ ppidfile = optarg;
+ break;
case 'r':
restart = 1;
break;
+ case 'R':
+ restart = strtol(optarg, &p, 0);
+ if (p == optarg || restart < 1)
+ errx(6, "invalid restart delay");
+ break;
+ case 'M':
+ mask = strtol(optarg, &p, 0);
+ if (p == optarg || mask < 0 || mask > 0777)
+ errx(6, "unrecognized umask");
+ break;
case 's':
logpri = get_log_mapping(optarg, prioritynames);
if (logpri == -1)
errx(4, "unrecognized syslog priority");
dosyslog = 1;
break;
+ case 'S':
+ dosyslog = 1;
+ break;
case 't':
title = optarg;
break;
+ case 'T':
+ logtag = optarg;
+ dosyslog = 1;
+ break;
case 'u':
user = optarg;
break;

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 13, 10:45 AM (8 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36625020
Default Alt Text
D20983.id59864.diff (1 KB)

Event Timeline