Rename the run_cmd field to sw_runcmd to make it consistent with the
other fields in struct sigwork_entry. Approved by: rstone (co-mentor) MFC after: 1 week
This commit is contained in:
parent
6df0ff43f0
commit
6a82e4291b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=245963
@ -179,7 +179,7 @@ struct sigwork_entry {
|
||||
int sw_pidok; /* true if pid value is valid */
|
||||
pid_t sw_pid; /* the process id from the PID file */
|
||||
const char *sw_pidtype; /* "daemon" or "process group" */
|
||||
int run_cmd; /* run command or send PID to signal */
|
||||
int sw_runcmd; /* run command or send PID to signal */
|
||||
char sw_fname[1]; /* file the PID was read from or shell cmd */
|
||||
};
|
||||
|
||||
@ -1866,7 +1866,7 @@ do_sigwork(struct sigwork_entry *swork)
|
||||
int kres, secs;
|
||||
char *tmp;
|
||||
|
||||
if (swork->run_cmd == 0 && (!(swork->sw_pidok) || swork->sw_pid == 0))
|
||||
if (swork->sw_runcmd == 0 && (!(swork->sw_pidok) || swork->sw_pid == 0))
|
||||
return; /* no work to do... */
|
||||
|
||||
/*
|
||||
@ -1900,7 +1900,7 @@ do_sigwork(struct sigwork_entry *swork)
|
||||
}
|
||||
|
||||
if (noaction) {
|
||||
if (swork->run_cmd)
|
||||
if (swork->sw_runcmd)
|
||||
printf("\tsh -c '%s %d'\n", swork->sw_fname,
|
||||
swork->sw_signum);
|
||||
else {
|
||||
@ -1912,7 +1912,7 @@ do_sigwork(struct sigwork_entry *swork)
|
||||
return;
|
||||
}
|
||||
|
||||
if (swork->run_cmd) {
|
||||
if (swork->sw_runcmd) {
|
||||
asprintf(&tmp, "%s %d", swork->sw_fname, swork->sw_signum);
|
||||
if (tmp == NULL) {
|
||||
warn("can't allocate memory to run %s",
|
||||
@ -1988,7 +1988,7 @@ do_zipwork(struct zipwork_entry *zwork)
|
||||
else
|
||||
pgm_name++;
|
||||
|
||||
if (zwork->zw_swork != NULL && zwork->zw_swork->run_cmd == 0 &&
|
||||
if (zwork->zw_swork != NULL && zwork->zw_swork->sw_runcmd == 0 &&
|
||||
zwork->zw_swork->sw_pidok <= 0) {
|
||||
warnx(
|
||||
"log %s not compressed because daemon(s) not notified",
|
||||
@ -2080,12 +2080,12 @@ save_sigwork(const struct conf_entry *ent)
|
||||
tmpsiz = sizeof(struct sigwork_entry) + strlen(ent->pid_cmd_file) + 1;
|
||||
stmp = malloc(tmpsiz);
|
||||
|
||||
stmp->run_cmd = 0;
|
||||
stmp->sw_runcmd = 0;
|
||||
/* If this is a command to run we just set the flag and run command */
|
||||
if (ent->flags & CE_PID2CMD) {
|
||||
stmp->sw_pid = -1;
|
||||
stmp->sw_pidok = 0;
|
||||
stmp->run_cmd = 1;
|
||||
stmp->sw_runcmd = 1;
|
||||
} else {
|
||||
set_swpid(stmp, ent);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user