Date: Sun, 12 May 2024 05:15:05 -0600 From: Warner Losh <imp@bsdimp.com> To: Ronald Klop <ronald-lists@klop.ws> Cc: Warner Losh <imp@freebsd.org>, "<dev-commits-src-main@freebsd.org>" <dev-commits-src-main@freebsd.org>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org> Subject: Re: git: 9bcc1b18c119 - main - /bin/rmdir: Exit with status 2 for invalid arguments Message-ID: <CANCZdfqNFaJBmwYB2dAFqzg1p9%2Bo%2B03tvyG-vEkB9dH%2BVV4Jdw@mail.gmail.com> In-Reply-To: <1570892010.7412.1715499028011@localhost> References: <202405111916.44BJGJ2I010959@gitrepo.freebsd.org> <1570892010.7412.1715499028011@localhost>
next in thread | previous in thread | raw e-mail | index | archive | help
--00000000000037c1c206183fe2f1 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, May 12, 2024, 1:30=E2=80=AFAM Ronald Klop <ronald-lists@klop.ws> wr= ote: > Wouldn=E2=80=99t EX_USAGE fit really well? > > > https://man.freebsd.org/cgi/man.cgi?query=3Dsysexits&manpath=3DFreeBSD+4.= 3-RELEASE > Read the pull request. Warner > Regards, > Ronald > > *Van:* Warner Losh <imp@FreeBSD.org> > *Datum:* 11 mei 2024 21:16 > *Aan:* src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, > dev-commits-src-main@FreeBSD.org > *Onderwerp:* git: 9bcc1b18c119 - main - /bin/rmdir: Exit with status 2 > for invalid arguments > > The branch main has been updated by imp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D9bcc1b18c119148e4455e548c90b2bc= 9cef16d1b > > commit 9bcc1b18c119148e4455e548c90b2bc9cef16d1b > Author: Henrich Hartzer > AuthorDate: 2024-05-10 17:53:49 +0000 > Commit: Warner Losh > CommitDate: 2024-05-11 19:13:28 +0000 > > /bin/rmdir: Exit with status 2 for invalid arguments > > PR: 277677 > > Signed-off-by: Henrich Hartzer > Reviewed by: imp > Pull Request: https://github.com/freebsd/freebsd-src/pull/1161 > --- > bin/rmdir/rmdir.1 | 15 ++++++++------- > bin/rmdir/rmdir.c | 2 +- > bin/rmdir/tests/rmdir_test.sh | 6 +++--- > 3 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1 > index 87ca1f1547f0..eb23c605050c 100644 > --- a/bin/rmdir/rmdir.1 > +++ b/bin/rmdir/rmdir.1 > @@ -74,14 +74,14 @@ The > .Nm > utility exits with one of the following values: > .Bl -tag -width indent > -.It Li 0 > -Each directory entry specified by a > +.It Er 0 > +Each > .Ar directory > -operand > -referred to an empty directory and was removed > -successfully. > -.It Li >0 > -An error occurred. > +referred to an empty directory and was removed successfully. > +.It Er 1 > +An error occurred while attempting to remove one or more directories. > +.It Er 2 > +Invalid arguments. > .El > .Sh EXAMPLES > Remove the directory > @@ -97,6 +97,7 @@ stopping at the first non-empty directory (if any): > .Dl $ rmdir -p cow/horse/monkey > .Sh SEE ALSO > .Xr rm 1 > +.Xr rmdir 2 > .Sh STANDARDS > The > .Nm > diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c > index c5d3db831309..0a495018495c 100644 > --- a/bin/rmdir/rmdir.c > +++ b/bin/rmdir/rmdir.c > @@ -112,5 +112,5 @@ usage(void) > { > > (void)fprintf(stderr, "usage: rmdir [-pv] directory ... "); > - exit(1); > + exit(2); > } > diff --git a/bin/rmdir/tests/rmdir_test.sh b/bin/rmdir/tests/rmdir_test.s= h > index d443849258b6..ba80ac6204be 100644 > --- a/bin/rmdir/tests/rmdir_test.sh > +++ b/bin/rmdir/tests/rmdir_test.sh > @@ -35,8 +35,8 @@ invalid_usage_head() > > invalid_usage_body() > { > - atf_check -s not-exit:0 -e match:"$usage_output" rmdir -p > - atf_check -s not-exit:0 -e match:"$usage_output" rmdir -v > + atf_check -s exit:2 -e match:"$usage_output" rmdir -p > + atf_check -s exit:2 -e match:"$usage_output" rmdir -v > } > > atf_test_case no_arguments > @@ -47,7 +47,7 @@ no_arguments_head() > > no_arguments_body() > { > - atf_check -s not-exit:0 -e match:"$usage_output" rmdir > + atf_check -s exit:2 -e match:"$usage_output" rmdir > } > > atf_init_test_cases() > > ------------------------------ > > > > > --00000000000037c1c206183fe2f1 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"auto"><div><br><br><div class=3D"gmail_quote"><div dir=3D"ltr" = class=3D"gmail_attr">On Sun, May 12, 2024, 1:30=E2=80=AFAM Ronald Klop <= <a href=3D"mailto:ronald-lists@klop.ws">ronald-lists@klop.ws</a>> wrote:= <br></div><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;bord= er-left:1px #ccc solid;padding-left:1ex"><div>Wouldn=E2=80=99t EX_USAGE fit= really well?<div><br></div><div><a href=3D"https://man.freebsd.org/cgi/man= .cgi?query=3Dsysexits&manpath=3DFreeBSD+4.3-RELEASE" target=3D"_blank" = rel=3D"noreferrer">https://man.freebsd.org/cgi/man.cgi?query=3Dsysexits&= ;manpath=3DFreeBSD+4.3-RELEASE</a></div></div></blockquote></div></div><div= dir=3D"auto"><br></div><div dir=3D"auto">Read the pull request.</div><div = dir=3D"auto"><br></div><div dir=3D"auto">Warner=C2=A0</div><div dir=3D"auto= "><br></div><div dir=3D"auto"></div><div dir=3D"auto"><div class=3D"gmail_q= uote"><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-l= eft:1px #ccc solid;padding-left:1ex"><div><div><br></div><div>Regards,</div= ><div>Ronald</div><div><br></div><div><p><small><strong>Van:</strong> Warne= r Losh <imp@FreeBSD.org><br><strong>Datum:</strong> 11 mei 2024 21:16= <br><strong>Aan:</strong> src-committers@FreeBSD.org, dev-commits-src-all@F= reeBSD.org, dev-commits-src-main@FreeBSD.org<br><strong>Onderwerp:</strong>= git: 9bcc1b18c119 - main - /bin/rmdir: Exit with status 2 for invalid arg= uments<br></small></p><blockquote style=3D"margin-left:5px;border-left:3px = solid #ccc;margin-right:0px;padding-left:5px"><div id=3D"m_-309210973319939= 4394P"> <div id=3D"m_-3092109733199394394P.P">The branch main has been updated by i= mp:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D9bcc1b18c119148e4= 455e548c90b2bc9cef16d1b" target=3D"_blank" rel=3D"noreferrer">https://cgit.= FreeBSD.org/src/commit/?id=3D9bcc1b18c119148e4455e548c90b2bc9cef16d1b</a><b= r> <br> commit 9bcc1b18c119148e4455e548c90b2bc9cef16d1b<br> Author: =C2=A0=C2=A0=C2=A0=C2=A0Henrich Hartzer <u></u><br> AuthorDate: 2024-05-10 17:53:49 +0000<br> Commit: =C2=A0=C2=A0=C2=A0=C2=A0Warner Losh <u></u><br> CommitDate: 2024-05-11 19:13:28 +0000<br> <br> =C2=A0=C2=A0=C2=A0=C2=A0/bin/rmdir: Exit with status 2 for invalid argument= s<br> =C2=A0=C2=A0=C2=A0=C2=A0<br> =C2=A0=C2=A0=C2=A0=C2=A0PR: 277677<br> =C2=A0=C2=A0=C2=A0=C2=A0<br> =C2=A0=C2=A0=C2=A0=C2=A0Signed-off-by: Henrich Hartzer <u></u><br> =C2=A0=C2=A0=C2=A0=C2=A0Reviewed by: imp<br> =C2=A0=C2=A0=C2=A0=C2=A0Pull Request: <a href=3D"https://github.com/freebsd= /freebsd-src/pull/1161" target=3D"_blank" rel=3D"noreferrer">https://github= .com/freebsd/freebsd-src/pull/1161</a><br> ---<br> =C2=A0bin/rmdir/rmdir.1 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0| 15 ++++++++-------<br> =C2=A0bin/rmdir/rmdir.c =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0| =C2=A02 +-<br> =C2=A0bin/rmdir/tests/rmdir_test.sh | =C2=A06 +++---<br> =C2=A03 files changed, 12 insertions(+), 11 deletions(-)<br> <br> diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1<br> index 87ca1f1547f0..eb23c605050c 100644<br> --- a/bin/rmdir/rmdir.1<br> +++ b/bin/rmdir/rmdir.1<br> @@ -74,14 +74,14 @@ The<br> =C2=A0.Nm<br> =C2=A0utility exits with one of the following values:<br> =C2=A0.Bl -tag -width indent<br> -.It Li 0<br> -Each directory entry specified by a<br> +.It Er 0<br> +Each<br> =C2=A0.Ar directory<br> -operand<br> -referred to an empty directory and was removed<br> -successfully.<br> -.It Li >0<br> -An error occurred.<br> +referred to an empty directory and was removed successfully.<br> +.It Er 1<br> +An error occurred while attempting to remove one or more directories.<br> +.It Er 2<br> +Invalid arguments.<br> =C2=A0.El<br> =C2=A0.Sh EXAMPLES<br> =C2=A0Remove the directory<br> @@ -97,6 +97,7 @@ stopping at the first non-empty directory (if any):<br> =C2=A0.Dl $ rmdir -p cow/horse/monkey<br> =C2=A0.Sh SEE ALSO<br> =C2=A0.Xr rm 1<br> +.Xr rmdir 2<br> =C2=A0.Sh STANDARDS<br> =C2=A0The<br> =C2=A0.Nm<br> diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c<br> index c5d3db831309..0a495018495c 100644<br> --- a/bin/rmdir/rmdir.c<br> +++ b/bin/rmdir/rmdir.c<br> @@ -112,5 +112,5 @@ usage(void)<br> =C2=A0{<br> =C2=A0<br> =C2=A0=C2=A0=C2=A0=C2=A0(void)fprintf(stderr, "usage: rmdir [-pv] dire= ctory ... ");<br> - =C2=A0=C2=A0exit(1);<br> + =C2=A0=C2=A0exit(2);<br> =C2=A0}<br> diff --git a/bin/rmdir/tests/rmdir_test.sh b/bin/rmdir/tests/rmdir_test.sh<= br> index d443849258b6..ba80ac6204be 100644<br> --- a/bin/rmdir/tests/rmdir_test.sh<br> +++ b/bin/rmdir/tests/rmdir_test.sh<br> @@ -35,8 +35,8 @@ invalid_usage_head()<br> =C2=A0<br> =C2=A0invalid_usage_body()<br> =C2=A0{<br> - =C2=A0=C2=A0atf_check -s not-exit:0 -e match:"$usage_output" rm= dir -p<br> - =C2=A0=C2=A0atf_check -s not-exit:0 -e match:"$usage_output" rm= dir -v<br> + =C2=A0=C2=A0atf_check -s exit:2 -e match:"$usage_output" rmdir = -p<br> + =C2=A0=C2=A0atf_check -s exit:2 -e match:"$usage_output" rmdir = -v<br> =C2=A0}<br> =C2=A0<br> =C2=A0atf_test_case no_arguments<br> @@ -47,7 +47,7 @@ no_arguments_head()<br> =C2=A0<br> =C2=A0no_arguments_body()<br> =C2=A0{<br> - =C2=A0=C2=A0atf_check -s not-exit:0 -e match:"$usage_output" rm= dir<br> + =C2=A0=C2=A0atf_check -s exit:2 -e match:"$usage_output" rmdir<= br> =C2=A0}<br> =C2=A0<br> =C2=A0atf_init_test_cases()<br> <br> <u></u><u></u><u></u></div> <hr> </div> </blockquote><br><br><br></div></div></blockquote></div></div></div> --00000000000037c1c206183fe2f1--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfqNFaJBmwYB2dAFqzg1p9%2Bo%2B03tvyG-vEkB9dH%2BVV4Jdw>