Hey наб! On 4/20/23 21:36, наб wrote: > Should include all comments; includes Branden's wording. I'm going to sleep. Would you please rebase and send tomorrow whatever I didn't yet apply? I've got a mess of mailbox by now =) Let's see what I find in the git-log(1)... > > наб (8): > regex.3: Desoupify regexec() description Applied. > regex.3: Desoupify regerror() description Not yet it seems; please resend. > regex.3: Desoupify regfree() description Applied. > regex.3: Improve REG_STARTEND Applied. > regex.3, regex_t.3type, regmatch_t.3type, regoff_t.3type: Move & link > regex_t.3type into regex.3 > regex.3: Finalise move of reg*.3type Both not yet; please resend. > regex.3: Destandardeseify Match offsets Not yet; please resend. > regex.3: Further clarify the sole purpose of REG_NOSUB And not yet; please resend. Cheers, Alex > > man3/regex.3 | 226 ++++++++++++++++++++++---------------- > man3type/regex_t.3type | 64 +---------- > man3type/regmatch_t.3type | 2 +- > man3type/regoff_t.3type | 2 +- > 4 files changed, 133 insertions(+), 161 deletions(-) > > Range-diff against v5: > 1: fcb8df21b < -: --------- regex.3: Desoupify regcomp() description > 2: 7240de5b7 = 1: 1ad1aa6e9 regex.3: Desoupify regexec() description > 3: 108f30cd7 ! 2: 6c4d26f89 regex.3: Desoupify regerror() description > @@ Commit message > Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@xxxxxxxxxxxxxxxxxx> > > ## man3/regex.3 ## > -@@ man3/regex.3: .SH SYNOPSIS > - .BI " int " eflags ); > - .PP > - .BI "size_t regerror(int " errcode ", const regex_t *_Nullable restrict " preg , > --.BI " char " errbuf "[restrict ." errbuf_size "], \ > -+.BI " char " errbuf "[restrict ." errbuf_size "], \ > - size_t " errbuf_size ); > - .BI "void regfree(regex_t *" preg ); > - .fi > @@ man3/regex.3: .SS Error reporting > .BR regexec () > into error message strings. > @@ man3/regex.3: .SS Error reporting > -If both > -.I errbuf > -and > ++If > ++.I preg > ++isn't a null pointer, > +.I errcode > +must be the latest error returned from an operation on > +.IR preg . > -+If > -+.I preg > -+is a null pointer\(emthe latest error. > +.PP > +If > ++.I errbuf_size > ++is > ++.BR 0 , > ++the size of the required buffer is returned. > ++Otherwise, up to > .I errbuf_size > -are nonzero, > -.I errbuf > -is filled in with the first > -.I "errbuf_size \- 1" > -characters of the error message and a terminating null byte (\[aq]\e0\[aq]). > -+is > -+.BR 0 , > -+the size of the required buffer is returned. > -+Otherwise, up to > -+.I errbuf_size > +bytes are copied to > +.IR errbuf ; > +the error string is always null-terminated, and truncated to fit. > .SS Freeing > --Supplying > + Supplying > .BR regfree () > --with a precompiled pattern buffer, > --.IR preg , > --will free the memory allocated to the pattern buffer by the compiling > --process, > -+invalidates the pattern buffer at > -+.IR *preg , > -+which must have been initialized via > - .BR regcomp (). > - .SH RETURN VALUE > - .BR regcomp () > -: --------- > 3: 4b7971a5e regex.3: Desoupify regfree() description > 4: fd1a104d6 ! 4: 5fb4cc16f regex.3: Improve REG_STARTEND > @@ man3/regex.3: .SS Matching > -on large strings. > -It does not use > +on known-length strings. > -+.I pmatch > -+must point to a valid readable object. > +If any matches are returned > +.RB ( REG_NOSUB > +wasn't passed to > @@ man3/regex.3: .SS Matching > -processing. > +> 0), they overwrite > +.I pmatch > -+as usual, and the > -+.B Match offsets > -+remain relative to > ++as usual, and the match offsets remain relative to > +.IR string > +(not > +.IR string " + " pmatch[0].rm_so ). > 5: 198b7b4fa ! 5: 057a4a522 regex.3, regex_t.3type, regmatch_t.3type, regoff_t.3type: Move & link regex_t.3type into regex.3 > @@ Commit message > > ## man3/regex.3 ## > @@ man3/regex.3: .SH SYNOPSIS > - .BI " char " errbuf "[restrict ." errbuf_size "], \ > - size_t " errbuf_size ); > + .BI " char " errbuf "[_Nullable restrict ." errbuf_size ], > + .BI " size_t " errbuf_size ); > .BI "void regfree(regex_t *" preg ); > +.PP > +.B typedef struct { > 6: c6bc9cfd0 = 6: 60ac1a4d1 regex.3: Finalise move of reg*.3type > 7: 59b8294c8 = 7: 3313546db regex.3: Destandardeseify Match offsets > 8: 2e199fc3c ! 8: 7fa669481 regex.3: Further clarify the sole purpose of REG_NOSUB > @@ man3/regex.3: .SS Compilation > -.I nmatch > -and > -.I pmatch > -+Only report overall success: > ++Report only overall success. > .BR regexec () > -arguments will be ignored for this purpose (but > -+will only use > ++will use only > .I pmatch > -may still be used for > -.BR REG_STARTEND ). > +for > +.BR REG_STARTEND , > -+and ignore > ++ignoring > +.IR nmatch . > .TP > .B REG_NEWLINE -- <http://www.alejandro-colomar.es/> GPG key fingerprint: A9348594CE31283A826FBDD8D57633D441E25BB5
Attachment:
OpenPGP_signature
Description: OpenPGP digital signature