Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 11:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve error message if using "/help --" (#11796)

Browse Source
This commit is contained in:
Wuzzy 2021-12-01 19:22:46 +00:00 committed by GitHub
parent 57a59ae92d
commit 80c3c7e642
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/common/chatcommands.lua
View File

@ -7,7 +7,9 @@ local S = core.get_translator("__builtin")
core.registered_chatcommands = {} core.registered_chatcommands = {}
-- Interpret the parameters of a command, separating options and arguments. -- Interpret the parameters of a command, separating options and arguments.
-- Input: parameters of a command -- Input: command, param
-- command: name of command
-- param: parameters of command
-- Returns: opts, args -- Returns: opts, args
-- opts is a string of option letters, or false on error -- opts is a string of option letters, or false on error
-- args is an array with the non-option arguments in order, or an error message -- args is an array with the non-option arguments in order, or an error message
@ -19,14 +21,14 @@ core.registered_chatcommands = {}
-- "cdg", {"a", "b", "e", "f"} -- "cdg", {"a", "b", "e", "f"}
-- Negative numbers are taken as arguments. Long options (--option) are -- Negative numbers are taken as arguments. Long options (--option) are
-- currently rejected as reserved. -- currently rejected as reserved.
local function getopts(param) local function getopts(command, param)
local opts = "" local opts = ""
local args = {} local args = {}
for match in param:gmatch("%S+") do for match in param:gmatch("%S+") do
if match:byte(1) == 45 then -- 45 = '-' if match:byte(1) == 45 then -- 45 = '-'
local second = match:byte(2) local second = match:byte(2)
if second == 45 then if second == 45 then
return false, S("Flags beginning with -- are reserved") return false, S("Invalid parameters (see /help @1).", command)
elseif second and (second < 48 or second > 57) then -- 48 = '0', 57 = '9' elseif second and (second < 48 or second > 57) then -- 48 = '0', 57 = '9'
opts = opts .. match:sub(2) opts = opts .. match:sub(2)
else else
@ -80,7 +82,7 @@ local function format_help_line(cmd, def)
end end
local function do_help_cmd(name, param) local function do_help_cmd(name, param)
local opts, args = getopts(param) local opts, args = getopts("help", param)
if not opts then if not opts then
return false, args return false, args
end end