Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8879f988 authored by Colin Cross's avatar Colin Cross
Browse files

fastboot: use getopt_long 

Modify the fastboot argument parsing to use getopt_long.  This
simplifies argument parsing, and permutes all the commands to the end of
argv to allow parsing them later.

Also moves usb initailization between argument and command processing,
to allow commands to query parameters over usb.

Change-Id: I883572f52c4190c80ee3b4aa4511ea2061a6b734
parent b43828b2

fastboot/fastboot.c

+62 −46
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <unistd.h>

#include <unistd.h>

#include <limits.h>

#include <limits.h>

#include <ctype.h>

#include <ctype.h>

#include <getopt.h>





#include <sys/time.h>

#include <sys/time.h>

#include <bootimg.h>

#include <bootimg.h>
@@ -575,62 +576,76 @@ int main(int argc, char **argv) 
    unsigned sz;

    unsigned sz;

    unsigned page_size = 2048;

    unsigned page_size = 2048;

    int status;

    int status;

    int c;





    skip(1);

    struct option longopts = { 0, 0, 0, 0 };

    if (argc == 0) {

        usage();

        return 1;

    }





    if (!strcmp(*argv, "devices")) {

    serial = getenv("ANDROID_SERIAL");

        list_devices();

        return 0;

    }





    if (!strcmp(*argv, "help")) {

    while (1) {

        usage();

        c = getopt_long(argc, argv, "wb:n:s:p:c:i:h", &longopts, NULL);

        return 0;

        if (c < 0) {

            break;

        }

        }







        switch (c) {

    serial = getenv("ANDROID_SERIAL");

        case 'w':



    while (argc > 0) {

        if(!strcmp(*argv, "-w")) {

            wants_wipe = 1;

            wants_wipe = 1;

            skip(1);

            break;

        } else if(!strcmp(*argv, "-b")) {

        case 'b':

            require(2);

            base_addr = strtoul(optarg, 0, 16);

            base_addr = strtoul(argv[1], 0, 16);

            break;

            skip(2);

        case 'n':

        } else if(!strcmp(*argv, "-n")) {

            page_size = (unsigned)strtoul(optarg, NULL, 0);

            require(2);

            page_size = (unsigned)strtoul(argv[1], NULL, 0);

            if (!page_size) die("invalid page size");

            if (!page_size) die("invalid page size");

            skip(2);

            break;

        } else if(!strcmp(*argv, "-s")) {

        case 's':

            require(2);

            serial = optarg;

            serial = argv[1];

            break;

            skip(2);

        case 'p':

        } else if(!strcmp(*argv, "-p")) {

            product = optarg;

            require(2);

            break;

            product = argv[1];

        case 'c':

            skip(2);

            cmdline = optarg;

        } else if(!strcmp(*argv, "-c")) {

            break;

            require(2);

        case 'i': {

            cmdline = argv[1];

            skip(2);

        } else if(!strcmp(*argv, "-i")) {

                char *endptr = NULL;

                char *endptr = NULL;

                unsigned long val;

                unsigned long val;





            require(2);

                val = strtoul(optarg, &endptr, 0);

            val = strtoul(argv[1], &endptr, 0);

                if (!endptr || *endptr != '\0' || (val & ~0xffff))

                if (!endptr || *endptr != '\0' || (val & ~0xffff))

                die("invalid vendor id '%s'", argv[1]);

                    die("invalid vendor id '%s'", optarg);

                vendor_id = (unsigned short)val;

                vendor_id = (unsigned short)val;

            skip(2);

                break;

        } else if(!strcmp(*argv, "getvar")) {

            }

        case 'h':

            usage();

            return 1;

        case '?':

            return 1;

        default:

            abort();

        }

    }



    argc -= optind;

    argv += optind;



    if (argc == 0 && !wants_wipe) {

        usage();

        return 1;

    }



    if (!strcmp(*argv, "devices")) {

        skip(1);

        list_devices();

        return 0;

    }



    usb = open_device();



    while (argc > 0) {

        if(!strcmp(*argv, "getvar")) {

            require(2);

            require(2);

            fb_queue_display(argv[1], argv[1]);

            fb_queue_display(argv[1], argv[1]);

            skip(2);

            skip(2);
@@ -719,6 +734,9 @@ int main(int argc, char **argv) 
            wants_reboot = 1;

            wants_reboot = 1;

        } else if(!strcmp(*argv, "oem")) {

        } else if(!strcmp(*argv, "oem")) {

            argc = do_oem_command(argc, argv);

            argc = do_oem_command(argc, argv);

        } else if (!strcmp(*argv, "help")) {

            usage();

            return 0;

        } else {

        } else {

            usage();

            usage();

            return 1;

            return 1;
@@ -737,8 +755,6 @@ int main(int argc, char **argv) 
        fb_queue_command("reboot-bootloader", "rebooting into bootloader");

        fb_queue_command("reboot-bootloader", "rebooting into bootloader");

    }

    }





    usb = open_device();



    status = fb_execute_queue(usb);

    status = fb_execute_queue(usb);

    return (status) ? 1 : 0;

    return (status) ? 1 : 0;

}
 
}