This patch does probably too much, but it's hard (and very cumbersome/time consuming) to break it out. What is does is this: * each command has one short description, e.g. "list MUX configuration" * made sure the short descriptions start lowercase * each command has one usage. That string contains just the options, e.g. "[-npn]". It's not part of the long help text. * that is, it doesn't say "[OPTIONS]" anymore, every usable option is listed by character in this (short) option string (the long description is in the long help text, as before) * help texts have been reworked, to make them - sometimes smaller - sometimes describe the options better - more often present themselves in a nicer format * all long help texts are now created with BUSYBOX_CMD_HELP_ macros, no more 'static const __maybe_unused char cmd_foobar_help[]' * made sure the long help texts starts uppercase * because cmdtp->name and cmdtp->opts together provide the new usage, all "Usage: foobar" texts have been removed from the long help texts * BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this is nicer in the source code * BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself * made sure no line gets longer than 77 characters * delibertely renamed cmdtp->usage, so that we can get compile-time errors (e.g. in out-of-tree modules that use register_command() * the 'help' command can now always emit the usage, even without compiled long help texts * 'help -v' gives a list of commands with their short description, this is similar like the old "help" command before my patchset * 'help -a' gives out help of all commands Signed-off-by: Holger Schurig <holgerschurig@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
100 lines
2.4 KiB
C
100 lines
2.4 KiB
C
/*
|
|
* Copyright (c) 2008-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <complete.h>
|
|
#include <password.h>
|
|
#include <errno.h>
|
|
|
|
#define PASSWD_MAX_LENGTH (128 + 1)
|
|
|
|
#if defined(CONFIG_PASSWD_MODE_STAR)
|
|
#define PASSWD_MODE STAR
|
|
#elif defined(CONFIG_PASSWD_MODE_CLEAR)
|
|
#define PASSWD_MODE CLEAR
|
|
#else
|
|
#define PASSWD_MODE HIDE
|
|
#endif
|
|
|
|
static int do_passwd(int argc, char *argv[])
|
|
{
|
|
unsigned char passwd2[PASSWD_MAX_LENGTH];
|
|
unsigned char passwd1[PASSWD_MAX_LENGTH];
|
|
int passwd1_len;
|
|
int passwd2_len;
|
|
int ret = 1;
|
|
|
|
puts("Enter new password: ");
|
|
passwd1_len = password(passwd1, PASSWD_MAX_LENGTH, PASSWD_MODE, 0);
|
|
|
|
if (passwd1_len < 0)
|
|
return 1;
|
|
|
|
puts("Retype new password: ");
|
|
passwd2_len = password(passwd2, PASSWD_MAX_LENGTH, PASSWD_MODE, 0);
|
|
|
|
if (passwd2_len < 0)
|
|
return 1;
|
|
|
|
if (passwd2_len != passwd1_len) {
|
|
goto err;
|
|
} else {
|
|
if (passwd1_len == 0) {
|
|
ret = 0;
|
|
goto disable;
|
|
}
|
|
|
|
if (strncmp(passwd1, passwd2, passwd1_len) != 0)
|
|
goto err;
|
|
}
|
|
|
|
ret = set_env_passwd(passwd1, passwd1_len);
|
|
|
|
if (ret < 0) {
|
|
puts("Sorry, passwords write failed\n");
|
|
ret = 1;
|
|
goto disable;
|
|
}
|
|
|
|
return 0;
|
|
err:
|
|
puts("Sorry, passwords do not match\n");
|
|
puts("passwd: password unchanged\n");
|
|
return 1;
|
|
|
|
disable:
|
|
passwd_env_disable();
|
|
puts("passwd: password disabled\n");
|
|
return ret;
|
|
}
|
|
|
|
BAREBOX_CMD_HELP_START(passwd)
|
|
BAREBOX_CMD_HELP_TEXT("'Interactively asks for a password. The digest of this password will be")
|
|
BAREBOX_CMD_HELP_TEXT("stored in " PASSWD_DIR "/passwd. This is then used by the 'login' command.")
|
|
BAREBOX_CMD_HELP_TEXT("")
|
|
BAREBOX_CMD_HELP_TEXT("Entering an empty string will disable the password function.")
|
|
BAREBOX_CMD_HELP_END
|
|
|
|
BAREBOX_CMD_START(passwd)
|
|
.cmd = do_passwd,
|
|
BAREBOX_CMD_DESC("set password")
|
|
BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE)
|
|
BAREBOX_CMD_HELP(cmd_passwd_help)
|
|
BAREBOX_CMD_COMPLETE(empty_complete)
|
|
BAREBOX_CMD_END
|