onyx_online/vmrcli
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/vmrcli.git synced 2024-11-15 17:40:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

move quickcommands into parse_command()

Browse Source
This commit is contained in:
onyx-and-iris 2024-07-10 23:37:49 +01:00
parent f60fc231b0
commit ff2970f4c5
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/util.h
View File

@ -18,6 +18,6 @@ void remove_last_part_of_path(char *fullpath);
char *kind_as_string(char *s, int kind, int n); char *kind_as_string(char *s, int kind, int n);
char *version_as_string(char *s, long v, int n); char *version_as_string(char *s, long v, int n);
bool is_comment(char *s); bool is_comment(char *s);
struct quickcommand *command_in_quickcommands(const char *command, struct quickcommand *quickcommands, int n); struct quickcommand *command_in_quickcommands(const char *command, const struct quickcommand *quickcommands, int n);
#endif /* __UTIL_H__ */ #endif /* __UTIL_H__ */

4
src/util.c
View File

@ -93,13 +93,13 @@ bool is_comment(char *s)
* @return struct quickcommand* Pointer to the found quickcommand * @return struct quickcommand* Pointer to the found quickcommand
* May return NULL if quickcommand not found. * May return NULL if quickcommand not found.
*/ */
struct quickcommand *command_in_quickcommands(const char *command_key, struct quickcommand *quickcommands, int n) struct quickcommand *command_in_quickcommands(const char *command_key, const struct quickcommand *quickcommands, int n)
{ {
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
if (strncmp(command_key, quickcommands[i].name, strlen(command_key)) == 0) if (strncmp(command_key, quickcommands[i].name, strlen(command_key)) == 0)
{ {
return &quickcommands[i]; return (struct quickcommand *)&quickcommands[i];
} }
} }
return NULL; return NULL;

19
src/vmrcli.c
View File

@ -34,6 +34,7 @@
#define OPTSTR ":hk:msc:iID:v" #define OPTSTR ":hk:msc:iID:v"
#define MAX_LINE 512 #define MAX_LINE 512
#define COUNT_OF(x) (sizeof(x) / sizeof(x[0])) #define COUNT_OF(x) (sizeof(x) / sizeof(x[0]))
#define DELIMITERS " \t;,"
/** /**
* @enum The kind of values a get call may return. * @enum The kind of values a get call may return.
@ -57,13 +58,6 @@ struct result
} val; } val;
}; };
struct quickcommand quickcommands[] = {
{.name = "lock", .fullcommand = "command.lock=1"},
{.name = "unlock", .fullcommand = "command.lock=0"},
{.name = "show", .fullcommand = "command.show=1"},
{.name = "hide", .fullcommand = "command.show=0"},
{.name = "restart", .fullcommand = "command.restart=1"}};
static bool vflag = false; static bool vflag = false;
static void usage(void); static void usage(void);
@ -278,11 +272,11 @@ void parse_input(PT_VMR vmr, char *input)
char *token, *p; char *token, *p;
token = strtok_r(input, " \t;,", &p); token = strtok_r(input, DELIMITERS, &p);
while (token != NULL) while (token != NULL)
{ {
parse_command(vmr, token); parse_command(vmr, token);
token = strtok_r(NULL, " \t;,", &p); token = strtok_r(NULL, DELIMITERS, &p);
} }
} }
@ -298,6 +292,13 @@ void parse_command(PT_VMR vmr, char *command)
{ {
log_debug("Parsing %s", command); log_debug("Parsing %s", command);
static const struct quickcommand quickcommands[] = {
{.name = "lock", .fullcommand = "command.lock=1"},
{.name = "unlock", .fullcommand = "command.lock=0"},
{.name = "show", .fullcommand = "command.show=1"},
{.name = "hide", .fullcommand = "command.show=0"},
{.name = "restart", .fullcommand = "command.restart=1"}};
struct quickcommand *qc_ptr = command_in_quickcommands(command, quickcommands, (int)COUNT_OF(quickcommands)); struct quickcommand *qc_ptr = command_in_quickcommands(command, quickcommands, (int)COUNT_OF(quickcommands));
if (qc_ptr != NULL) if (qc_ptr != NULL)
{ {