1 files changed, 87 insertions, 41 deletions

diff --git a/tools/ideviceenterrecovery.c b/tools/ideviceenterrecovery.c
index 827946b..29cc5c9 100644
--- a/tools/ideviceenterrecovery.c
+++ b/tools/ideviceenterrecovery.c
@@ -8,86 +8,132 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define TOOL_NAME "ideviceenterrecovery"
+
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
 #include <stdlib.h>
+#include <getopt.h>
+#include <errno.h>
+#ifndef WIN32
+#include <signal.h>
+#endif
 
 #include <libimobiledevice/libimobiledevice.h>
 #include <libimobiledevice/lockdown.h>
 
-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] UUID\n", (name ? name + 1: argv[0]));
-        printf("Makes a device with the supplied 40-digit UUID enter recovery mode immediately.\n\n");
-        printf("  -d, --debug\t\tenable communication debugging\n");
-        printf("  -h, --help\t\tprints usage information\n");
-        printf("\n");
+        char *name = strrchr(argv[0], '/');
+        fprintf(is_error ? stderr : stdout, "Usage: %s [OPTIONS] UDID\n", (name ? name + 1: argv[0]));
+        fprintf(is_error ? stderr : stdout,
+                "\n"
+                "Makes a device with the supplied UDID enter recovery mode immediately.\n"
+                "\n"
+                "OPTIONS:\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[])
 {
         lockdownd_client_t client = NULL;
-        idevice_t phone = NULL;
+        lockdownd_error_t ldret = LOCKDOWN_E_UNKNOWN_ERROR;
+        idevice_t device = NULL;
         idevice_error_t ret = IDEVICE_E_UNKNOWN_ERROR;
-        int i;
-        char uuid[41];
-        uuid[0] = 0;
+        const char* udid = NULL;
+        int c = 0;
+        const struct option longopts[] = {
+                { "debug", no_argument, NULL, 'd' },
+                { "help", no_argument, NULL, 'h' },
+                { "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")) {
+        while ((c = getopt_long(argc, argv, "dhv", longopts, NULL)) != -1) {
+                switch (c) {
+                case 'd':
                         idevice_set_debug_level(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;
+                case 'v':
+                        printf("%s %s\n", TOOL_NAME, PACKAGE_VERSION);
                         return 0;
+                default:
+                        print_usage(argc, argv, 1);
+                        return 2;
                 }
         }
+        argc -= optind;
+        argv += optind;
 
-        i--;
-        if (!argv[i] || (strlen(argv[i]) != 40)) {
-                print_usage(argc, argv);
-                return 0;
+        if (!argv[0]) {
+                fprintf(stderr, "ERROR: No UDID specified\n");
+                print_usage(argc+optind, argv-optind, 1);
+                return 2;
         }
-        strcpy(uuid, argv[i]);
+        udid = argv[0];
 
-        ret = idevice_new(&phone, uuid);
+        ret = idevice_new(&device, udid);
         if (ret != IDEVICE_E_SUCCESS) {
-                printf("No device found with uuid %s, is it plugged in?\n", uuid);
-                return -1;
+                printf("No device found with udid %s.\n", udid);
+                return 1;
         }
 
-        if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client, "ideviceenterrecovery")) {
-                idevice_free(phone);
-                return -1;
+        if (LOCKDOWN_E_SUCCESS != (ldret = lockdownd_client_new(device, &client, TOOL_NAME))) {
+                printf("ERROR: Could not connect to lockdownd: %s (%d)\n", lockdownd_strerror(ldret), ldret);
+                idevice_free(device);
+                return 1;
         }
 
-        /* run query and output information */
-        printf("Telling device with uuid %s to enter recovery mode.\n", uuid);
-        if(lockdownd_enter_recovery(client) != LOCKDOWN_E_SUCCESS)
-        {
+        int res = 0;
+        printf("Telling device with udid %s to enter recovery mode.\n", udid);
+        ldret = lockdownd_enter_recovery(client);
+        if (ldret == LOCKDOWN_E_SESSION_INACTIVE) {
+                lockdownd_client_free(client);
+                client = NULL;
+                if (LOCKDOWN_E_SUCCESS != (ldret = lockdownd_client_new_with_handshake(device, &client, TOOL_NAME))) {
+                        printf("ERROR: Could not connect to lockdownd: %s (%d)\n", lockdownd_strerror(ldret), ldret);
+                        idevice_free(device);
+                        return 1;
+                }
+                ldret = lockdownd_enter_recovery(client);
+        }
+        if (ldret != LOCKDOWN_E_SUCCESS) {
                 printf("Failed to enter recovery mode.\n");
+                res = 1;
+        } else {
+                printf("Device is successfully switching to recovery mode.\n");
         }
-        printf("Device is successfully switching to recovery mode.\n");
 
         lockdownd_client_free(client);
-        idevice_free(phone);
+        idevice_free(device);
 
-        return 0;
+        return res;
 }