tools: Use getopt for option parsing in all tools

1 files changed, 70 insertions, 63 deletions

diff --git a/tools/idevicedate.c b/tools/idevicedate.c
index 505ed30..d05f63e 100644
--- a/tools/idevicedate.c
+++ b/tools/idevicedate.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <getopt.h>
 #include <time.h>
 #if HAVE_LANGINFO_CODESET
 #include <langinfo.h>
@@ -49,29 +50,29 @@
 #endif
 #endif
 
-static void print_usage(int argc, char **argv)
+static void print_usage(int argc, char **argv, int is_error)
 {
-        char *name = NULL;
-
-        name = strrchr(argv[0], '/');
-        printf("Usage: %s [OPTIONS]\n", (name ? name + 1: argv[0]));
-        printf("\n");
-        printf("Display the current date or set it on a device.\n");
-        printf("\n");
-        printf("NOTE: Setting the time on iOS 6 and later is only supported\n");
-        printf("      in the setup wizard screens before device activation.\n");
-        printf("\n");
-        printf("OPTIONS:\n");
-        printf("  -u, --udid UDID\ttarget specific device by UDID\n");
-        printf("  -n, --network\t\tconnect to network device\n");
-        printf("  -s, --set TIMESTAMP\tset UTC time described by TIMESTAMP\n");
-        printf("  -c, --sync\t\tset time of device to current system time\n");
-        printf("  -d, --debug\t\tenable communication debugging\n");
-        printf("  -h, --help\t\tprints usage information\n");
-        printf("  -v, --version\t\tprints version information\n");
-        printf("\n");
-        printf("Homepage:    <" PACKAGE_URL ">\n");
-        printf("Bug Reports: <" PACKAGE_BUGREPORT ">\n");
+        char *name = strrchr(argv[0], '/');
+        fprintf(is_error ? stderr : stdout, "Usage: %s [OPTIONS]\n", (name ? name + 1: argv[0]));
+        fprintf(is_error ? stderr : stdout,
+                "\n"
+                "Display the current date or set it on a device.\n"
+                "\n"
+                "NOTE: Setting the time on iOS 6 and later is only supported\n"
+                "      in the setup wizard screens before device activation.\n"
+                "\n"
+                "OPTIONS:\n"
+                "  -u, --udid UDID       target specific device by UDID\n"
+                "  -n, --network         connect to network device\n"
+                "  -s, --set TIMESTAMP   set UTC time described by TIMESTAMP\n"
+                "  -c, --sync            set time of device to current system time\n"
+                "  -d, --debug           enable communication debugging\n"
+                "  -h, --help            prints usage information\n"
+                "  -v, --version         prints version information\n"
+                "\n"
+                "Homepage:    <" PACKAGE_URL ">\n"
+                "Bug Reports: <" PACKAGE_BUGREPORT ">\n"
+        );
 }
 
 int main(int argc, char *argv[])
@@ -80,7 +81,6 @@ int main(int argc, char *argv[])
         lockdownd_error_t ldret = LOCKDOWN_E_UNKNOWN_ERROR;
         idevice_t device = NULL;
         idevice_error_t ret = IDEVICE_E_UNKNOWN_ERROR;
-        int i;
         const char* udid = NULL;
         int use_network = 0;
         time_t setdate = 0;
@@ -92,65 +92,72 @@ int main(int argc, char *argv[])
         char buffer[80];
         int result = 0;
 
+        int c = 0;
+        const struct option longopts[] = {
+                { "debug", no_argument, NULL, 'd' },
+                { "help", no_argument, NULL, 'h' },
+                { "udid", required_argument, NULL, 'u' },
+                { "network", no_argument, NULL, 'n' },
+                { "version", no_argument, NULL, 'v' },
+                { "set", required_argument, NULL, 's' },
+                { "sync", no_argument, NULL, 'c' },
+                { NULL, 0, NULL, 0}
+        };
+
 #ifndef WIN32
         signal(SIGPIPE, SIG_IGN);
 #endif
         /* parse cmdline args */
-        for (i = 1; i < argc; i++) {
-                if (!strcmp(argv[i], "-d") || !strcmp(argv[i], "--debug")) {
+        while ((c = getopt_long(argc, argv, "dhu:nvs:c", longopts, NULL)) != -1) {
+                switch (c) {
+                case 'd':
                         idevice_set_debug_level(1);
-                        continue;
-                }
-                else if (!strcmp(argv[i], "-u") || !strcmp(argv[i], "--udid")) {
-                        i++;
-                        if (!argv[i] || !*argv[i]) {
-                                print_usage(argc, argv);
-                                return 0;
+                        break;
+                case 'u':
+                        if (!*optarg) {
+                                fprintf(stderr, "ERROR: UDID argument must not be empty!\n");
+                                print_usage(argc, argv, 1);
+                                return 2;
                         }
-                        udid = argv[i];
-                        continue;
-                }
-                else if (!strcmp(argv[i], "-n") || !strcmp(argv[i], "--network")) {
+                        udid = optarg;
+                        break;
+                case 'n':
                         use_network = 1;
-                        continue;
-                }
-                else if (!strcmp(argv[i], "-s") || !strcmp(argv[i], "--set")) {
-                        i++;
-                        if (!argv[i] || (strlen(argv[i]) <= 1)) {
-                                print_usage(argc, argv);
-                                return 0;
+                        break;
+                case 'h':
+                        print_usage(argc, argv, 0);
+                        return 0;
+                case 'v':
+                        printf("%s %s\n", TOOL_NAME, PACKAGE_VERSION);
+                        return 0;
+                case 's':
+                        if (!*optarg) {
+                                fprintf(stderr, "ERROR: set argument must not be empty!\n");
+                                print_usage(argc, argv, 1);
+                                return 2;
                         }
-                        setdate = atoi(argv[i]);
+                        setdate = atoi(optarg);
                         if (setdate == 0) {
-                                printf("ERROR: Invalid timestamp value.\n");
-                                print_usage(argc, argv);
+                                fprintf(stderr, "ERROR: Invalid timestamp value.\n");
+                                print_usage(argc, argv, 1);
                                 return 0;
                         }
-                        continue;
-                }
-                else if (!strcmp(argv[i], "-c") || !strcmp(argv[i], "--sync")) {
-                        i++;
+                        break;
+                case 'c':
                         /* get current time */
                         setdate = time(NULL);
                         /* convert it to local time which sets timezone/daylight variables */
                         tmp = localtime(&setdate);
                         /* recalculate to make it UTC */
                         setdate = mktime(tmp);
-                        continue;
-                }
-                else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) {
-                        print_usage(argc, argv);
-                        return 0;
-                }
-                else if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) {
-                        printf("%s %s\n", TOOL_NAME, PACKAGE_VERSION);
-                        return 0;
-                }
-                else {
-                        print_usage(argc, argv);
-                        return 0;
+                        break;
+                default:
+                        print_usage(argc, argv, 1);
+                        return 2;
                 }
         }
+        argc -= optind;
+        argv += optind;
 
         ret = idevice_new_with_options(&device, udid, (use_network) ? IDEVICE_LOOKUP_NETWORK : IDEVICE_LOOKUP_USBMUX);
         if (ret != IDEVICE_E_SUCCESS) {