curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-13 07:32:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

managen: insert final .fi for files ending with a quote

Browse Source 
When an individual file ended with a quote (typically an example), the
render function would return without ending the quote correctly with a
".fi" (fill in) in the manpage output.

This made the additional text provided below to render wrongly.

Closes #14048
This commit is contained in:
Daniel Stenberg 2024-06-28 09:01:08 +02:00
parent ad7a20d506
commit e63e0d60b5
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/managen
View File

@ -454,6 +454,10 @@ sub render {
print STDERR "$f:$line:1:ERROR: trailing blank line\n"; print STDERR "$f:$line:1:ERROR: trailing blank line\n";
exit 3; exit 3;
} }
if($quote) {
# don't leave the quote "hanging"
push @desc, ".fi\n" if($manpage);
}
if($tablemode) { if($tablemode) {
# end of table # end of table
push @desc, ".RE\n.IP\n" if($manpage); push @desc, ".RE\n.IP\n" if($manpage);
@ -673,9 +677,6 @@ sub single {
} }
} }
printdesc($manpage, 2, (@leading, @desc));
undef @desc;
my @extra; my @extra;
if($multi eq "single") { if($multi eq "single") {
push @extra, "${pre}If --$long is provided several times, the last set ". push @extra, "${pre}If --$long is provided several times, the last set ".
@ -706,7 +707,7 @@ sub single {
} }
elsif($multi eq "per-URL") { elsif($multi eq "per-URL") {
push @extra, push @extra,
"${pre}--$long is associated with a single URL. Use it once per URL\n". "${pre}--$long is associated with a single URL. Use it once per URL ".
"when you use several URLs in a command line.\n"; "when you use several URLs in a command line.\n";
} }
else { else {
@ -714,7 +715,8 @@ sub single {
return 2; return 2;
} }
printdesc($manpage, 2, @extra); printdesc($manpage, 2, (@leading, @desc, @extra));
undef @desc;
my @foot; my @foot;

10
tests/data/test1705
View File

@ -74,6 +74,10 @@ If you think this option still does not give you enough details, consider using
Note that verbose output of curl activities and network traffic might contain Note that verbose output of curl activities and network traffic might contain
sensitive data, including usernames, credentials or secret data content. Be sensitive data, including usernames, credentials or secret data content. Be
aware and be careful when sharing trace logs with others. aware and be careful when sharing trace logs with others.
End with a quote
hello
</file2> </file2>
<file3 name="%LOGDIR/option2.md"> <file3 name="%LOGDIR/option2.md">
--- ---
@ -217,6 +221,12 @@ Note that verbose output of curl activities and network traffic might contain
sensitive data, including usernames, credentials or secret data content. Be sensitive data, including usernames, credentials or secret data content. Be
aware and be careful when sharing trace logs with others. aware and be careful when sharing trace logs with others.
End with a quote
.nf
hello
.fi
This option is global and does not need to be specified for each use of --next. This option is global and does not need to be specified for each use of --next.
Providing --fakeitreal multiple times has no extra effect. Providing --fakeitreal multiple times has no extra effect.

6
tests/data/test1706
View File

@ -195,10 +195,8 @@ DESCRIPTION
logs with others. logs with others.
This option is global and does not need to be specified for each This option is global and does not need to be specified for each
use of --next. use of --next. Providing --fakeitreal multiple times has no extra
effect. Disable it again with --no-fakeitreal.
Providing --fakeitreal multiple times has no extra effect. Disable
it again with --no-fakeitreal.
Example: Example:
curl --verbose https://example.com curl --verbose https://example.com