On Thu, Jul 3, 2014 at 11:10 AM, Laszlo Papp <lp...@kde.org> wrote:

> commit 761fd153e340a14abccc0af89f2f6617faf2077f
> Author: Laszlo Papp <lp...@kde.org>
> Date:   Thu Jul 3 11:06:58 2014 +0100
>
>     Add optional home directory removal support to deluser
>
> diff --git a/loginutils/deluser.c b/loginutils/deluser.c
> index e39ac55..67b744b 100644
> --- a/loginutils/deluser.c
> +++ b/loginutils/deluser.c
> @@ -11,9 +11,10 @@
>   */
>
>  //usage:#define deluser_trivial_usage
> -//usage:       "USER"
> +//usage:       "[-h] USER"
>  //usage:#define deluser_full_usage "\n\n"
>  //usage:       "Delete USER from the system"
> +//usage:       "\n    -h   Remove the home directory"
>
>  //usage:#define delgroup_trivial_usage
>  //usage:       IF_FEATURE_DEL_USER_FROM_GROUP("[USER] ")"GROUP"
> @@ -35,11 +36,15 @@ int deluser_main(int argc, char **argv)
>         /* Name of shadow or gshadow file */
>         const char *sfile;
>         /* Are we deluser or delgroup? */
> +    struct passwd *pw = 0;
>

This could probably be one line below not to distract the comment and
corresponding variable declaration. Although, ideally, this would need to
go to the "case 2" branch, but I did not want to introduce a new block
there with re-indenting many lines. Also, do you prefer "NULL" instead of
"0"?

Let me know what the preferred style is...

The patch is tested with and without "-h" and it works. The option
selection is "-h" which reminds some people the canonical "help", but on
the contrary, this is also what is used for adduser to create the home
directory, so I picked it up for being consistent. Again, let me know your
preference ...
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox

Reply via email to