Author: ngie
Date: Wed Jul 19 20:26:35 2017
New Revision: 321243
URL: https://svnweb.freebsd.org/changeset/base/321243
Log:
MFC r310329:
r310329 (by cem):
Add a 'force' option for non-interactive crontab removal
Add a '-f' option to force crontab '-r' to be non-interactive.
Modified:
stable/10/usr.sbin/cron/crontab/crontab.1
stable/10/usr.sbin/cron/crontab/crontab.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/cron/crontab/crontab.1
==============================================================================
--- stable/10/usr.sbin/cron/crontab/crontab.1 Wed Jul 19 20:24:38 2017
(r321242)
+++ stable/10/usr.sbin/cron/crontab/crontab.1 Wed Jul 19 20:26:35 2017
(r321243)
@@ -17,7 +17,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 13, 2010
+.Dd December 20, 2016
.Dt CRONTAB 1
.Os
.Sh NAME
@@ -31,7 +31,8 @@
.Op Fl u Ar user
{
.Fl l |
-.Fl r |
+.Fl r Op Fl f
+|
.Fl e
}
.Sh DESCRIPTION
@@ -97,6 +98,11 @@ option for safety's sake.
Display the current crontab on standard output.
.It Fl r
Remove the current crontab.
+By default the
+.Fl r
+option prompts for confirmation, adding the
+.Fl f
+option will attempt to remove the current crontab without confirmation.
.It Fl e
Edit the current crontab using the editor specified by
the
Modified: stable/10/usr.sbin/cron/crontab/crontab.c
==============================================================================
--- stable/10/usr.sbin/cron/crontab/crontab.c Wed Jul 19 20:24:38 2017
(r321242)
+++ stable/10/usr.sbin/cron/crontab/crontab.c Wed Jul 19 20:26:35 2017
(r321243)
@@ -63,6 +63,7 @@ static char Filename[MAX_FNAME];
static FILE *NewCrontab;
static int CheckErrorCount;
static enum opt_t Option;
+static int fflag;
static struct passwd *pw;
static void list_cmd(void),
delete_cmd(void),
@@ -79,7 +80,7 @@ usage(char *msg)
fprintf(stderr, "crontab: usage error: %s\n", msg);
fprintf(stderr, "%s\n%s\n",
"usage: crontab [-u user] file",
- " crontab [-u user] { -e | -l | -r }");
+ " crontab [-u user] { -l | -r [-f] | -e }");
exit(ERROR_EXIT);
}
@@ -142,7 +143,7 @@ parse_args(argc, argv)
strcpy(RealUser, User);
Filename[0] = '\0';
Option = opt_unknown;
- while ((argch = getopt(argc, argv, "u:lerx:")) != -1) {
+ while ((argch = getopt(argc, argv, "u:lerx:f")) != -1) {
switch (argch) {
case 'x':
if (!set_debug_flags(optarg))
@@ -172,6 +173,9 @@ parse_args(argc, argv)
usage("only one operation permitted");
Option = opt_edit;
break;
+ case 'f':
+ fflag = 1;
+ break;
default:
usage("unrecognized option");
}
@@ -282,7 +286,7 @@ delete_cmd() {
char n[MAX_FNAME];
int ch, first;
- if (isatty(STDIN_FILENO)) {
+ if (!fflag && isatty(STDIN_FILENO)) {
(void)fprintf(stderr, "remove crontab for %s? ", User);
first = ch = getchar();
while (ch != '\n' && ch != EOF)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
