aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Kevin Ballard <kevin@sb.org>2014-10-13 18:33:55 -0700
committerGravatar Kevin Ballard <kevin@sb.org>2014-10-13 18:33:55 -0700
commit4568359e27e4e1f5c07ad1dd533c55e3d58bdd64 (patch)
treed04c9fd90cba4995f42827e3f5e162a399ab873a
parent07e417041863fc1639b00599acac690635c657f5 (diff)
Remove some obsolete job flags
These flags were used by the old parser, but not by the new one.
-rw-r--r--parse_execution.cpp1
-rw-r--r--proc.h13
2 files changed, 2 insertions, 12 deletions
diff --git a/parse_execution.cpp b/parse_execution.cpp
index b01b6f5e..fb9c9718 100644
--- a/parse_execution.cpp
+++ b/parse_execution.cpp
@@ -972,7 +972,6 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(job_t
/* If we were not able to expand any wildcards, here is the first one that failed */
if (unmatched_wildcard != NULL)
{
- job_set_flag(job, JOB_WILDCARD_ERROR, 1);
return report_unmatched_wildcard_error(*unmatched_wildcard);
}
diff --git a/proc.h b/proc.h
index e89184a8..3f35e69b 100644
--- a/proc.h
+++ b/proc.h
@@ -253,20 +253,11 @@ enum
/** Whether the exit status should be negated. This flag can only be set by the not builtin. */
JOB_NEGATE = 1 << 4,
- /** Whether the exit status should be used to re-evaluate the condition in an if block? This is only used by elseif and is a big hack. */
- JOB_ELSEIF = 1 << 5,
-
- /** This flag is set to one on wildcard expansion errors. It means that the current command should not be executed */
- JOB_WILDCARD_ERROR = 1 << 6,
-
- /** Whether to skip executing this job. This flag is set by the short-circuit builtins, i.e. and and or */
- JOB_SKIP = 1 << 7,
-
/** Whether the job is under job control */
- JOB_CONTROL = 1 << 8,
+ JOB_CONTROL = 1 << 5,
/** Whether the job wants to own the terminal when in the foreground */
- JOB_TERMINAL = 1 << 9
+ JOB_TERMINAL = 1 << 6
};
typedef int job_id_t;