read-until-match can optionally keep matched text.

* regex.c (read_until_match): New argument, include_match.
Three times repeated termination code refactored into block
reached by forward goto.
(regex_init): Registration of read-until-match updated.

* regex.h (read_until_match): Declaration updated.

* stream.c (struct record_adapter_base): New member,
include_match.
(record_adapter_get_line): Pass match to read_until_match
as new argument.
(record_adapater): New argument, include_match.
(stream_init): Update registration of record-adapter.

* stream.h (record_adapter): Declaration updated.

* txr.1: Updated.

1 files changed, 1 insertions, 1 deletions

diff --git a/stream.h b/stream.h
index 920cdf3e..192f7bbb 100644
--- a/stream.h
+++ b/stream.h
@@ -152,7 +152,7 @@ val get_string_from_stream(val);
 val make_strlist_output_stream(void);
 val get_list_from_stream(val);
 val make_dir_stream(DIR *);
-val record_adapter(val regex, val stream);
+val record_adapter(val regex, val stream, val include_match);
 val streamp(val obj);
 val real_time_stream_p(val obj);
 val stream_set_prop(val stream, val ind, val prop);