summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Youngman <jay@gnu.org>2015-12-18 22:29:54 +0000
committerJames Youngman <jay@gnu.org>2015-12-18 22:31:04 +0000
commit4bce720c01367736e101f484b0939f5e0e56debb (patch)
tree502730fa6fc237ed49bfa21f7ac35f42b120dd3d
parentf05ecf7731f6107f68979876643f5d7adc20227d (diff)
downloadfindutils-4bce720c01367736e101f484b0939f5e0e56debb.tar.gz
Revert change with badly-formatted change-log entry.
This reverts commit db79379e3bae8d3dbdad1400c34a65820bac8cb7.
-rw-r--r--NEWS7
-rw-r--r--doc/find.texi39
-rw-r--r--find/find.137
3 files changed, 3 insertions, 80 deletions
diff --git a/NEWS b/NEWS
index 74c445a7..a8b883b0 100644
--- a/NEWS
+++ b/NEWS
@@ -2,13 +2,6 @@ GNU findutils NEWS - User visible changes. -*- outline -*- (allout)
* Major changes in release 4.5.16-git, 2015-12-DD
-** Documentation Changes
-
-The man page and Texinfo documentation how have clearer descriptions
-of how find's own exit status is affected when a command run by -exec
-exits with a non-zero status. Likewise for the other actions similar
-to -exec.
-
* Major changes in release 4.5.15, 2015-12-18
** Bug Fixes
diff --git a/doc/find.texi b/doc/find.texi
index bd1d6a16..a83a645d 100644
--- a/doc/find.texi
+++ b/doc/find.texi
@@ -2113,7 +2113,6 @@ perform arbitrary actions on the files.
* Single File::
* Multiple Files::
* Querying::
-* Child Exit Status::
@end menu
@node Single File
@@ -2765,44 +2764,6 @@ from the terminal. Only run the command line if the response starts
with @samp{y} or @samp{Y}. Implies @samp{-t}.
@end table
-
-@node Child Exit Status
-@subsection Child Exit Status
-
-The handling of the exit status of commands run by @code{find} depends
-on which action was used to launch the command. Single-argument
-actions carry the exit status of the child forward as the result of
-the action itself. Multiple-argument actions always return true, but
-if the launched command exits with a non-zero status, the exit status
-of @code{find} itself will be non-zero.
-
-The effect of a non-zero command exit status is as follows:
-
-@table @samp
-@item -exec ... ;
-The action returns false; the exit status of @code{find} is unaffected.
-@item -execdir ... ;
-The action returns false; the exit status of @code{find} is unaffected.
-@item -ok ... ;
-The action returns false; the exit status of @code{find} is unaffected.
-@item -okdir ... ;
-The action returns false; the exit status of @code{find} is unaffected.
-@item -exec ... +
-The action returns true; the exit status of @code{find} will be non-zero.
-@item -execdir ... +
-The action returns true; the exit status of @code{find} will be non-zero.
-@item -ok ... +
-The action returns true; the exit status of @code{find} will be non-zero.
-@item -okdir ... +
-The action returns true; the exit status of @code{find} will be non-zero.
-@end table
-
-If a command cannot be launched at all and the failure occurs in the
-parent process (i.e. the running @code{find} program) it will exit
-with a non-zero status. If the failure occurs in the child process,
-it is unspecified whether or not this is distinguished from a failure
-of the command itself.
-
@node Delete Files
@section Delete Files
diff --git a/find/find.1 b/find/find.1
index a42dfe0f..cc3f9d46 100644
--- a/find/find.1
+++ b/find/find.1
@@ -975,10 +975,7 @@ and
together.
.IP "\-exec \fIcommand\fR ;"
-Execute \fIcommand\fR; true if 0 status is returned. The exit status
-of
-.B find
-itself is not affected. All following
+Execute \fIcommand\fR; true if 0 status is returned. All following
arguments to
.B find
are taken to be arguments to the command until an argument consisting
@@ -1018,12 +1015,7 @@ encounters an error, this can sometimes cause an
immediate exit, so some pending commands may not be run
at all. This variant of
.B \-exec
-always returns true. When the invoked command exits
-with a non-zero status, the exit status of
-.B find
-itself is non-zero, but the
-.B \-exec
-action itself will still have evaluated as true.
+always returns true.
.IP "\-execdir \fIcommand\fR ;"
.IP "\-execdir \fIcommand\fR {} +"
@@ -1070,10 +1062,7 @@ always returns true, while
.B {} ;
returns true only if
.I command
-returns 0. The exit status of
-.B find
-itself is affected or not according to the rule for
-.BR \-exec .
+returns 0.
.IP "\-fls \fIfile\fR"
@@ -2062,26 +2051,6 @@ or
.B \-execdir ... {} +
may not have been performed.
-If a command run by
-.B \-exec ... {} +
-or
-.B \-execdir ... {} +
-or
-.B \-ok ... {} +
-or
-.B \-okdir ... {} +
-exits with a non-zero status, the exit status of
-.B find
-will also be non-zero (though it is not guaranteed to be the same
-value). The equivalent actions when terminated by
-.B ;
-instead of
-.B +
-do not affect the exit status, except in some cases of failure to
-invoke the command itself (for example, failure of the
-.BR fork (2)
-system call).
-
.SH "SEE ALSO"
\fBlocate\fP(1), \fBlocatedb\fP(5), \fBupdatedb\fP(1), \fBxargs\fP(1),