Embedded/letter-shell
1
0
Fork 0
mirror of https://github.com/NevermindZZT/letter-shell.git synced 2025-01-21 10:02:54 +08:00
Code Issues Releases Wiki Activity

修复权限问题

Browse Source 
修复用户可以使用无权限命令的问题
修复打印有符号数引发异常的问题
This commit is contained in:
Letter 2020-01-18 11:53:16 +08:00
parent 912bbf5851
commit 07932c5576
3 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -1,7 +1,7 @@
# letter shell 3.0 # letter shell 3.0
![version](https://img.shields.io/badge/version-3.0.0_beta1-brightgreen.svg) ![version](https://img.shields.io/badge/version-3.0.0_beta2-brightgreen.svg)
![build](https://img.shields.io/badge/build-2020.01.17-brightgreen.svg) ![build](https://img.shields.io/badge/build-2020.01.18-brightgreen.svg)
![build](https://img.shields.io/badge/license-MIT-brightgreen.svg) ![build](https://img.shields.io/badge/license-MIT-brightgreen.svg)
一个功能强大的嵌入式shell 一个功能强大的嵌入式shell
@ -32,6 +32,8 @@
此外3.0版本修改了命令格式和定义，2.x版本的工程需要经过简单的修改才能完成迁移 此外3.0版本修改了命令格式和定义，2.x版本的工程需要经过简单的修改才能完成迁移
若只需要使用基础功能，可以使用[letter shell 2.x](https://github.com/NevermindZZT/letter-shell/tree/shell2.x)版本
## 功能 ## 功能
- 命令自动补全 - 命令自动补全

36
src/shell.c
View File

@ -126,7 +126,6 @@ static Shell *shellList[SHELL_MAX_NUMBER] = {NULL};
static void shellAdd(Shell *shell); static void shellAdd(Shell *shell);
static unsigned short shellWriteString(Shell *shell, const char *string);
static void shellWriteCommandLine(Shell *shell); static void shellWriteCommandLine(Shell *shell);
static void shellWirteReturnValue(Shell *shell, int value); static void shellWirteReturnValue(Shell *shell, int value);
static void shellShowVar(Shell *shell, ShellCommand *command); static void shellShowVar(Shell *shell, ShellCommand *command);
@ -148,6 +147,8 @@ void shellInit(Shell *shell, char *buffer, unsigned short size)
shell->history.offset = 0; shell->history.offset = 0;
shell->history.number = 0; shell->history.number = 0;
shell->history.record = 0; shell->history.record = 0;
shell->info.user = NULL;
shell->status.isChecked = 1;
shell->parser.buffer = buffer; shell->parser.buffer = buffer;
shell->parser.bufferSize = size / (SHELL_HISTORY_MAX_NUMBER + 1); shell->parser.bufferSize = size / (SHELL_HISTORY_MAX_NUMBER + 1);
@ -253,7 +254,7 @@ static void shellWriteByte(Shell *shell, const char data)
* *
* @return unsigned short 写入字符的数量 * @return unsigned short 写入字符的数量
*/ */
static unsigned short shellWriteString(Shell *shell, const char *string) unsigned short shellWriteString(Shell *shell, const char *string)
{ {
unsigned short count = 0; unsigned short count = 0;
SHELL_ASSERT(shell->write, return 0); SHELL_ASSERT(shell->write, return 0);
@ -329,6 +330,7 @@ static void shellWriteCommandLine(Shell *shell)
signed char shellCheckPermission(Shell *shell, ShellCommand *command) signed char shellCheckPermission(Shell *shell, ShellCommand *command)
{ {
return ((!command->attr.attrs.permission return ((!command->attr.attrs.permission
|| command->attr.attrs.type == SHELL_TYPE_USER
|| (command->attr.attrs.permission || (command->attr.attrs.permission
& shell->info.user->attr.attrs.permission)) & shell->info.user->attr.attrs.permission))
&& (shell->status.isChecked && (shell->status.isChecked
@ -345,7 +347,7 @@ signed char shellCheckPermission(Shell *shell, ShellCommand *command)
* *
* @return signed char 转换后有效数据长度 * @return signed char 转换后有效数据长度
*/ */
signed char shellToHex(int value, char *buffer) signed char shellToHex(unsigned int value, char *buffer)
{ {
char byte; char byte;
char i = 8; char i = 8;
@ -370,13 +372,13 @@ signed char shellToHex(int value, char *buffer)
*/ */
signed char shellToDec(int value, char *buffer) signed char shellToDec(int value, char *buffer)
{ {
char i = 10; char i = 11;
int v = value; int v = value;
if (value < 0) if (value < 0)
{ {
v = -value; v = -value;
} }
buffer[10] = 0; buffer[11] = 0;
while (v) while (v)
{ {
buffer[--i] = v % 10 + 48; buffer[--i] = v % 10 + 48;
@ -386,7 +388,7 @@ signed char shellToDec(int value, char *buffer)
{ {
buffer[--i] = '-'; buffer[--i] = '-';
} }
return 10 - i; return 11 - i;
} }
@ -588,7 +590,8 @@ void shellListUser(Shell *shell)
for (short i = 0; i < shell->commandList.count; i++) for (short i = 0; i < shell->commandList.count; i++)
{ {
if (base[i].attr.attrs.type > SHELL_TYPE_VAL if (base[i].attr.attrs.type > SHELL_TYPE_VAL
&& base[i].attr.attrs.type <= SHELL_TYPE_USER) && base[i].attr.attrs.type <= SHELL_TYPE_USER
&& shellCheckPermission(shell, &base[i]) == 0)
{ {
shellListItem(shell, &base[i]); shellListItem(shell, &base[i]);
} }
@ -843,7 +846,8 @@ ShellCommand* shellSeekCommand(Shell *shell,
((int)base - (int)shell->commandList.base) / sizeof(ShellCommand); ((int)base - (int)shell->commandList.base) / sizeof(ShellCommand);
for (unsigned short i = 0; i < count; i++) for (unsigned short i = 0; i < count; i++)
{ {
if (base[i].attr.attrs.type == SHELL_TYPE_KEY) if (base[i].attr.attrs.type == SHELL_TYPE_KEY
|| shellCheckPermission(shell, &base[i]) != 0)
{ {
continue; continue;
} }
@ -940,12 +944,11 @@ void shellSetVarValue(Shell *shell, ShellCommand *command, int value)
*/ */
static void shellShowVar(Shell *shell, ShellCommand *command) static void shellShowVar(Shell *shell, ShellCommand *command)
{ {
char buffer[11] = "0000000000"; char buffer[12] = "00000000000";
int value = shellGetVarValue(shell, command); int value = shellGetVarValue(shell, command);
shellWriteString(shell, command->data.var.name); shellWriteString(shell, command->data.var.name);
shellWriteString(shell, " = "); shellWriteString(shell, " = ");
shellToDec(value, buffer); shellWriteString(shell, &buffer[11 - shellToDec(value, buffer)]);
shellWriteString(shell, buffer);
shellWriteString(shell, ", 0x"); shellWriteString(shell, ", 0x");
for (short i = 0; i < 11; i++) for (short i = 0; i < 11; i++)
{ {
@ -990,7 +993,8 @@ int shellSetVar(char *name, int value)
shellSetVarValue(shell, command, value); shellSetVarValue(shell, command, value);
return shellGetVarValue(shell, command); return shellGetVarValue(shell, command);
} }
SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC), SHELL_EXPORT_CMD(
SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_DISABLE_RETURN,
setVar, shellSetVar, set var); setVar, shellSetVar, set var);
@ -1087,10 +1091,9 @@ static void shellSetUser(Shell *shell, const ShellCommand *user)
*/ */
static void shellWirteReturnValue(Shell *shell, int value) static void shellWirteReturnValue(Shell *shell, int value)
{ {
char buffer[11] = "0000000000"; char buffer[12] = "00000000000";
shellWriteString(shell, "Return: "); shellWriteString(shell, "Return: ");
shellToDec(value, buffer); shellWriteString(shell, &buffer[11 - shellToDec(value, buffer)]);
shellWriteString(shell, buffer);
shellWriteString(shell, ", 0x"); shellWriteString(shell, ", 0x");
for (short i = 0; i < 11; i++) for (short i = 0; i < 11; i++)
{ {
@ -1276,7 +1279,8 @@ void shellTab(Shell *shell)
ShellCommand *base = (ShellCommand *)shell->commandList.base; ShellCommand *base = (ShellCommand *)shell->commandList.base;
for (short i = 0; i < shell->commandList.count; i++) for (short i = 0; i < shell->commandList.count; i++)
{ {
if (shellStringCompare(shell->parser.buffer, if (shellCheckPermission(shell, &base[i]) == 0
&& shellStringCompare(shell->parser.buffer,
(char *)shellGetCommandName(&base[i])) (char *)shellGetCommandName(&base[i]))
== shell->parser.length) == shell->parser.length)
{ {

4
src/shell.h
View File

@ -14,7 +14,7 @@
#include "shell_cfg.h" #include "shell_cfg.h"
#define SHELL_VERSION "3.0.0-beta1" /**< 版本号 */ #define SHELL_VERSION "3.0.0-beta2" /**< 版本号 */
/** /**
@ -320,6 +320,8 @@ typedef struct shell_command
void shellInit(Shell *shell, char *buffer, unsigned short size); void shellInit(Shell *shell, char *buffer, unsigned short size);
unsigned short shellWriteString(Shell *shell, const char *string);
Shell* shellGetCurrent(void);
void shellHandler(Shell *shell, char data); void shellHandler(Shell *shell, char data);
void shellTask(void *param); void shellTask(void *param);