We're going to add some tests that exercise failure at one or both of
these points, so add an argument to allow it and return the len -- for
the control message failure, the caller will be verifying that we
received data but no files.
No functional change.