tools: Use getopt for option parsing in all tools

1 files changed, 117 insertions, 111 deletions

diff --git a/tools/idevicescreenshot.c b/tools/idevicescreenshot.c
index 9b1ffa3..0e694c7 100644
--- a/tools/idevicescreenshot.c
+++ b/tools/idevicescreenshot.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <getopt.h>
 #include <errno.h>
 #include <time.h>
 #include <unistd.h>
@@ -39,8 +40,86 @@
 #include <libimobiledevice/lockdown.h>
 #include <libimobiledevice/screenshotr.h>
 
-void get_image_filename(char *imgdata, char **filename);
-void print_usage(int argc, char **argv);
+static void get_image_filename(char *imgdata, char **filename)
+{
+	// If the provided filename already has an extension, use it as is.
+	if (*filename) {
+		char *last_dot = strrchr(*filename, '.');
+		if (last_dot && !strchr(last_dot, '/')) {
+			return;
+		}
+	}
+
+	// Find the appropriate file extension for the filename.
+	const char *fileext = NULL;
+	if (memcmp(imgdata, "\x89PNG", 4) == 0) {
+		fileext = ".png";
+	} else if (memcmp(imgdata, "MM\x00*", 4) == 0) {
+		fileext = ".tiff";
+	} else {
+		printf("WARNING: screenshot data has unexpected image format.\n");
+		fileext = ".dat";
+	}
+
+	// If a filename without an extension is provided, append the extension.
+	// Otherwise, generate a filename based on the current time.
+	char *basename = NULL;
+	if (*filename) {
+		basename = (char*)malloc(strlen(*filename) + 1);
+		strcpy(basename, *filename);
+		free(*filename);
+		*filename = NULL;
+	} else {
+		time_t now = time(NULL);
+		basename = (char*)malloc(32);
+		strftime(basename, 31, "screenshot-%Y-%m-%d-%H-%M-%S", gmtime(&now));
+	}
+
+	// Ensure the filename is unique on disk.
+	char *unique_filename = (char*)malloc(strlen(basename) + strlen(fileext) + 7);
+	sprintf(unique_filename, "%s%s", basename, fileext);
+	int i;
+	for (i = 2; i < (1 << 16); i++) {
+		if (access(unique_filename, F_OK) == -1) {
+			*filename = unique_filename;
+			break;
+		}
+		sprintf(unique_filename, "%s-%d%s", basename, i, fileext);
+	}
+	if (!*filename) {
+		free(unique_filename);
+	}
+	free(basename);
+}
+
+static void print_usage(int argc, char **argv, int is_error)
+{
+	char *name = strrchr(argv[0], '/');
+	fprintf(is_error ? stderr : stdout, "Usage: %s [OPTIONS] [FILE]\n", (name ? name + 1: argv[0]));
+	fprintf(is_error ? stderr : stdout,
+		"\n"
+		"Gets a screenshot from a connected device.\n"
+		"\n"
+		"The image is in PNG format for iOS 9+ and otherwise in TIFF format.\n"
+		"The screenshot is saved as an image with the given FILE name.\n"
+		"If FILE has no extension, FILE will be a prefix of the saved filename.\n"
+		"If FILE is not specified, \"screenshot-DATE\", will be used as a prefix\n"
+		"of the filename, e.g.:\n"
+		"   ./screenshot-2013-12-31-23-59-59.tiff\n"
+		"\n"
+		"NOTE: A mounted developer disk image is required on the device, otherwise\n"
+		"the screenshotr service is not available.\n"
+		"\n"
+		"  -u, --udid UDID       target specific device by UDID\n"
+		"  -n, --network         connect to network device\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)
 {
@@ -50,50 +129,58 @@ int main(int argc, char **argv)
 	screenshotr_client_t shotr = NULL;
 	lockdownd_service_descriptor_t service = NULL;
 	int result = -1;
-	int i;
 	const char *udid = NULL;
 	int use_network = 0;
 	char *filename = NULL;
+	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' },
+		{ 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")) {
+
+	/* parse cmdline arguments */
+	while ((c = getopt_long(argc, argv, "dhu:nv", 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], "-h") || !strcmp(argv[i], "--help")) {
-			print_usage(argc, argv);
+			break;
+		case 'h':
+			print_usage(argc, argv, 0);
 			return 0;
-		}
-		else if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) {
+		case 'v':
 			printf("%s %s\n", TOOL_NAME, PACKAGE_VERSION);
 			return 0;
-		}
-		else if (argv[i][0] != '-' && !filename) {
-			filename = strdup(argv[i]);
-			continue;
-		}
-		else {
-			print_usage(argc, argv);
-			return 0;
+		default:
+			print_usage(argc, argv, 1);
+			return 2;
 		}
 	}
+	argc -= optind;
+	argv += optind;
+
+	if (argv[0]) {
+		filename = strdup(argv[0]);
+	}
 
 	if (IDEVICE_E_SUCCESS != idevice_new_with_options(&device, udid, (use_network) ? IDEVICE_LOOKUP_NETWORK : IDEVICE_LOOKUP_USBMUX)) {
 		if (udid) {
@@ -153,84 +240,3 @@ int main(int argc, char **argv)
 
 	return result;
 }
-
-void get_image_filename(char *imgdata, char **filename)
-{
-	// If the provided filename already has an extension, use it as is.
-	if (*filename) {
-		char *last_dot = strrchr(*filename, '.');
-		if (last_dot && !strchr(last_dot, '/')) {
-			return;
-		}
-	}
-
-	// Find the appropriate file extension for the filename.
-	const char *fileext = NULL;
-	if (memcmp(imgdata, "\x89PNG", 4) == 0) {
-		fileext = ".png";
-	} else if (memcmp(imgdata, "MM\x00*", 4) == 0) {
-		fileext = ".tiff";
-	} else {
-		printf("WARNING: screenshot data has unexpected image format.\n");
-		fileext = ".dat";
-	}
-
-	// If a filename without an extension is provided, append the extension.
-	// Otherwise, generate a filename based on the current time.
-	char *basename = NULL;
-	if (*filename) {
-		basename = (char*)malloc(strlen(*filename) + 1);
-		strcpy(basename, *filename);
-		free(*filename);
-		*filename = NULL;
-	} else {
-		time_t now = time(NULL);
-		basename = (char*)malloc(32);
-		strftime(basename, 31, "screenshot-%Y-%m-%d-%H-%M-%S", gmtime(&now));
-	}
-
-	// Ensure the filename is unique on disk.
-	char *unique_filename = (char*)malloc(strlen(basename) + strlen(fileext) + 7);
-	sprintf(unique_filename, "%s%s", basename, fileext);
-	int i;
-	for (i = 2; i < (1 << 16); i++) {
-		if (access(unique_filename, F_OK) == -1) {
-			*filename = unique_filename;
-			break;
-		}
-		sprintf(unique_filename, "%s-%d%s", basename, i, fileext);
-	}
-	if (!*filename) {
-		free(unique_filename);
-	}
-	free(basename);
-}
-
-void print_usage(int argc, char **argv)
-{
-	char *name = NULL;
-
-	name = strrchr(argv[0], '/');
-	printf("Usage: %s [OPTIONS] [FILE]\n", (name ? name + 1: argv[0]));
-	printf("\n");
-	printf("Gets a screenshot from a connected device.\n");
-	printf("\n");
-	printf("The image is in PNG format for iOS 9+ and otherwise in TIFF format.\n");
-	printf("The screenshot is saved as an image with the given FILE name.\n");
-	printf("If FILE has no extension, FILE will be a prefix of the saved filename.\n");
-	printf("If FILE is not specified, \"screenshot-DATE\", will be used as a prefix\n");
-	printf("of the filename, e.g.:\n");
-	printf("   ./screenshot-2013-12-31-23-59-59.tiff\n");
-	printf("\n");
-	printf("NOTE: A mounted developer disk image is required on the device, otherwise\n");
-	printf("the screenshotr service is not available.\n");
-	printf("\n");
-	printf("  -u, --udid UDID\ttarget specific device by UDID\n");
-	printf("  -n, --network\t\tconnect to network device\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");
-}