Commit dd583296 authored by Kevin Wolf's avatar Kevin Wolf Committed by Stefan Hajnoczi

qemu-io: Factor out qemuio_command

It's duplicated code. Move it to qemu-io-cmds.c because it's not
dependent on any static data of the qemu-io tool.
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 797ac58c
...@@ -138,28 +138,11 @@ static char *get_prompt(void); ...@@ -138,28 +138,11 @@ static char *get_prompt(void);
void command_loop(void) void command_loop(void)
{ {
int c, i, done = 0, fetchable = 0, prompted = 0; int i, done = 0, fetchable = 0, prompted = 0;
char *input; char *input;
char **v;
const cmdinfo_t *ct;
for (i = 0; !done && i < ncmdline; i++) { for (i = 0; !done && i < ncmdline; i++) {
input = strdup(cmdline[i]); done = qemuio_command(cmdline[i]);
if (!input) {
fprintf(stderr, _("cannot strdup command '%s': %s\n"),
cmdline[i], strerror(errno));
exit(1);
}
v = breakline(input, &c);
if (c) {
ct = find_command(v[0]);
if (ct) {
done = command(ct, c, v);
} else {
fprintf(stderr, _("command \"%s\" not found\n"), v[0]);
}
}
doneline(input, v);
} }
if (cmdline) { if (cmdline) {
g_free(cmdline); g_free(cmdline);
...@@ -179,20 +162,13 @@ void command_loop(void) ...@@ -179,20 +162,13 @@ void command_loop(void)
if (!fetchable) { if (!fetchable) {
continue; continue;
} }
input = fetchline(); input = fetchline();
if (input == NULL) { if (input == NULL) {
break; break;
} }
v = breakline(input, &c); done = qemuio_command(input);
if (c) { free(input);
ct = find_command(v[0]);
if (ct) {
done = command(ct, c, v);
} else {
fprintf(stderr, _("command \"%s\" not found\n"), v[0]);
}
}
doneline(input, v);
prompted = 0; prompted = 0;
fetchable = 0; fetchable = 0;
...@@ -328,15 +304,6 @@ char **breakline(char *input, int *count) ...@@ -328,15 +304,6 @@ char **breakline(char *input, int *count)
return rval; return rval;
} }
void
doneline(
char *input,
char **vec)
{
free(input);
free(vec);
}
#define EXABYTES(x) ((long long)(x) << 60) #define EXABYTES(x) ((long long)(x) << 60)
#define PETABYTES(x) ((long long)(x) << 50) #define PETABYTES(x) ((long long)(x) << 50)
#define TERABYTES(x) ((long long)(x) << 40) #define TERABYTES(x) ((long long)(x) << 40)
......
...@@ -59,7 +59,6 @@ int command(const cmdinfo_t *ci, int argc, char **argv); ...@@ -59,7 +59,6 @@ int command(const cmdinfo_t *ci, int argc, char **argv);
/* from input.h */ /* from input.h */
char **breakline(char *input, int *count); char **breakline(char *input, int *count);
void doneline(char *input, char **vec);
char *fetchline(void); char *fetchline(void);
void cvtstr(double value, char *str, size_t sz); void cvtstr(double value, char *str, size_t sz);
...@@ -77,4 +76,6 @@ void timestr(struct timeval *tv, char *str, size_t sz, int flags); ...@@ -77,4 +76,6 @@ void timestr(struct timeval *tv, char *str, size_t sz, int flags);
extern char *progname; extern char *progname;
bool qemuio_command(const char *cmd);
#endif /* __COMMAND_H__ */ #endif /* __COMMAND_H__ */
...@@ -1807,6 +1807,30 @@ static int init_check_command(BlockDriverState *bs, const cmdinfo_t *ct) ...@@ -1807,6 +1807,30 @@ static int init_check_command(BlockDriverState *bs, const cmdinfo_t *ct)
return 1; return 1;
} }
bool qemuio_command(const char *cmd)
{
char *input;
const cmdinfo_t *ct;
char **v;
int c;
bool done = false;
input = g_strdup(cmd);
v = breakline(input, &c);
if (c) {
ct = find_command(v[0]);
if (ct) {
done = command(ct, c, v);
} else {
fprintf(stderr, "command \"%s\" not found\n", v[0]);
}
}
g_free(input);
g_free(v);
return done;
}
static void __attribute((constructor)) init_qemuio_commands(void) static void __attribute((constructor)) init_qemuio_commands(void)
{ {
/* initialize commands */ /* initialize commands */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment