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

pass len of input to replace_multiple_space_with_one()

Browse Source 
add an input prompt to interactive mode
This commit is contained in:
onyx-and-iris 2024-06-27 22:06:15 +01:00
parent 9191a38745
commit f88fb9b994
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/util.h
View File

@ -1,6 +1,6 @@
#ifndef __UTIL_H__ #ifndef __UTIL_H__
#define __UTIL_H__ #define __UTIL_H__
void replace_multiple_space_with_one(char *s); void replace_multiple_space_with_one(char *s, size_t len);
#endif /* __UTIL_H__ */ #endif /* __UTIL_H__ */

7
src/util.c
View File

@ -1,10 +1,9 @@
#include <string.h> #include <stddef.h>
void replace_multiple_space_with_one(char *s) void replace_multiple_space_with_one(char *s, size_t len)
{ {
int j = 0; int j = 0;
int count = 0; int count = 0;
int len = strlen(s);
if (len == 1 && (s[0] == ' ' || s[0] == '\t')) if (len == 1 && (s[0] == ' ' || s[0] == '\t'))
{ {
@ -33,6 +32,4 @@ void replace_multiple_space_with_one(char *s)
} }
} }
s[j] = '\0'; s[j] = '\0';
return;
} }

20
src/vmrcli.c
View File

@ -175,17 +175,24 @@ void interactive(T_VBVMR_INTERFACE *vmr)
char *p = input; char *p = input;
char command[MAX_LINE]; char command[MAX_LINE];
int i; int i;
size_t len;
printf(">> ");
while (fgets(input, MAX_LINE, stdin) != NULL) while (fgets(input, MAX_LINE, stdin) != NULL)
{ {
input[strcspn(input, "\n")] = 0; input[strcspn(input, "\n")] = 0;
if (strlen(input) == 1 && (strncmp(input, "Q", 1) == 0 || strncmp(input, "q", 1) == 0)) len = strlen(input);
if (len == 1 && toupper(input[0]) == 'Q')
break; break;
replace_multiple_space_with_one(input); replace_multiple_space_with_one(input, len);
while (*p) while (*p)
{ {
memset(command, '\0', sizeof(command)); if (isspace(*p))
{
p++;
continue;
}
i = 0; i = 0;
while (!isspace(*p)) while (!isspace(*p))
@ -194,11 +201,11 @@ void interactive(T_VBVMR_INTERFACE *vmr)
if (command[0] != '\0') if (command[0] != '\0')
parse_command(vmr, command); parse_command(vmr, command);
memset(command, '\0', sizeof(command));
p++; /* shift to next input char */
} }
p = input; /* reset pointer */ p = input; /* reset pointer */
printf(">> ");
} }
} }
@ -237,7 +244,6 @@ void parse_command(T_VBVMR_INTERFACE *vmr, char *command)
puts(res.val.s); puts(res.val.s);
break; break;
default: default:
log_error("Unexpected result type");
break; break;
} }
} }
@ -252,7 +258,7 @@ void get(T_VBVMR_INTERFACE *vmr, char *command, struct result *res)
if (get_parameter_string(vmr, command, res->val.s) != 0) if (get_parameter_string(vmr, command, res->val.s) != 0)
{ {
res->val.s[0] = 0; res->val.s[0] = 0;
log_error("Unknown parameter"); log_error("Unknown parameter '%s'", command);
} }
} }
} }