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

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

cmd.c

+5 −38
Original line number Diff line number Diff line
@@ -138,28 +138,11 @@ static char *get_prompt(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 **v;

    const cmdinfo_t *ct;



    for (i = 0; !done && i < ncmdline; i++) {

        input = strdup(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);

        done = qemuio_command(cmdline[i]);

    }

    if (cmdline) {

        g_free(cmdline);
@@ -179,20 +162,13 @@ void command_loop(void) 
        if (!fetchable) {

            continue;

        }



        input = fetchline();

        if (input == NULL) {

            break;

        }

        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);

        done = qemuio_command(input);

        free(input);



        prompted = 0;

        fetchable = 0;
@@ -328,15 +304,6 @@ char **breakline(char *input, int *count) 
    return rval;

}



void

doneline(

	char	*input,

	char	**vec)

{

	free(input);

	free(vec);

}



#define EXABYTES(x)	((long long)(x) << 60)

#define PETABYTES(x)	((long long)(x) << 50)

#define TERABYTES(x)	((long long)(x) << 40)

cmd.h

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ int command(const cmdinfo_t *ci, int argc, char **argv); 


/* from input.h */

char **breakline(char *input, int *count);

void doneline(char *input, char **vec);

char *fetchline(void);



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); 


extern char *progname;



bool qemuio_command(const char *cmd);



#endif	/* __COMMAND_H__ */

qemu-io-cmds.c

+24 −0
Original line number Diff line number Diff line
@@ -1807,6 +1807,30 @@ static int init_check_command(BlockDriverState *bs, const cmdinfo_t *ct) 
    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)

{

    /* initialize commands */