diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-10-30 13:14:49 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-10-30 13:14:49 +0000 |
| commit | d7bbd50442f0443c89053575a8cb9a77a4acc343 (patch) | |
| tree | 303c157a1dde5d35d76962e3a2f9e2a5981cfbba /usr/src/cmd/cron | |
| parent | eacc5467041c23968e9447b7143975ee4eaaeeee (diff) | |
| download | illumos-joyent-d7bbd50442f0443c89053575a8cb9a77a4acc343.tar.gz | |
11858 crontab could support /step [fix mismerge]
Diffstat (limited to 'usr/src/cmd/cron')
| -rw-r--r-- | usr/src/cmd/cron/Makefile | 24 | ||||
| -rw-r--r-- | usr/src/cmd/cron/cron.c | 1 |
2 files changed, 12 insertions, 13 deletions
diff --git a/usr/src/cmd/cron/Makefile b/usr/src/cmd/cron/Makefile index de59fa73cb..3f3320e989 100644 --- a/usr/src/cmd/cron/Makefile +++ b/usr/src/cmd/cron/Makefile @@ -102,15 +102,15 @@ XPG4ATOBJS= $(ATOBJS:%=objs.xpg4/%) $(XPG4OBJS:%=objs.xpg4/%) XPG6COMMONOBJS= $(COMMONOBJS:%=objs.xpg6/%) XPG6CTOBJS= $(CRONTABOBJS:%=objs.xpg6/%) -cron := POBJS = $(CRONOBJS) $(COMMONOBJ2) -at := POBJS = $(ATOBJS) $(COMMONOBJS) -at.xpg4 := POBJS = $(XPG4ATOBJS) $(XPG4COMMONOBJS) -atrm := POBJS = $(ATRMOBJS) $(COMMONOBJS) -atq := POBJS = $(ATQOBJS) $(COMMONOBJS) -crontab := POBJS = $(CRONTABOBJS) $(COMMONOBJS) -crontab.xpg4 := POBJS = $(XPG4CTOBJS) $(XPG4COMMONOBJS) -crontab.xpg6 := POBJS = $(XPG6CTOBJS) $(XPG6COMMONOBJS) -parsetest := POBJS = $(PARSETESTOBJS) +cron := OBJS = $(CRONOBJS) $(COMMONOBJ2) +at := OBJS = $(ATOBJS) $(COMMONOBJS) +at.xpg4 := OBJS = $(XPG4ATOBJS) $(XPG4COMMONOBJS) +atrm := OBJS = $(ATRMOBJS) $(COMMONOBJS) +atq := OBJS = $(ATQOBJS) $(COMMONOBJS) +crontab := OBJS = $(CRONTABOBJS) $(COMMONOBJS) +crontab.xpg4 := OBJS = $(XPG4CTOBJS) $(XPG4COMMONOBJS) +crontab.xpg6 := OBJS = $(XPG6CTOBJS) $(XPG6COMMONOBJS) +parsetest := OBJS = $(PARSETESTOBJS) CFLAGS += $(CCVERBOSE) @@ -163,8 +163,8 @@ all : $(PROG) $(XPG4) $(XPG6) $(SCRIPT) $(XPG4SCRIPT) $(FILES) \ install : all $(ROOTPROG) $(ROOTETCDEFAULTFILES) $(ROOTSYMLINK) \ $(ROOTMANIFEST) $(ROOTMETHOD) $(ROOTCRONDCRONTABS)/root -$(PROG) $(PARSETEST): $$(POBJS) - $(LINK.c) $(POBJS) -o $@ $(LDLIBS) +$(PROG) $(PARSETEST): $$(OBJS) + $(LINK.c) $(OBJS) -o $@ $(LDLIBS) $(POST_PROCESS) $(XPG4) : objs.xpg4 $$(OBJS) @@ -229,7 +229,7 @@ $(POFILE): $(POFILES) $(RM) $@; cat $(POFILES) > $@ clean : - $(RM) $(OBJS) att1.h att1.c att2.c + $(RM) $(COBJS) att1.h att1.c att2.c strip : $(STRIP) $(PROG) $(XPG4) $(XPG6) diff --git a/usr/src/cmd/cron/cron.c b/usr/src/cmd/cron/cron.c index 02843837ba..8b549c3f0d 100644 --- a/usr/src/cmd/cron/cron.c +++ b/usr/src/cmd/cron/cron.c @@ -311,7 +311,6 @@ static struct usr *find_usr(char *); static int ex(struct event *e); static void read_dirs(int); static void mail(char *, char *, int); -static char *next_field(int, int); static void readcron(char *, struct usr *, time_t); static void readcronfile(FILE *, struct usr *, time_t); static int next_ge(int, char *); |