Reland: Uprev libmtp to 1.1.12

examples/detect.c

 /**
  * \file detect.c
  * Example program to detect a device and list capabilities.
  *
- * Copyright (C) 2005-2008 Linus Walleij <triad@df.lth.se>
+ * Copyright (C) 2005-2015 Linus Walleij <triad@df.lth.se>
  * Copyright (C) 2007 Ted Bullock <tbullock@canada.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 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
@@ skipping 107 matching lines @@
   case LIBMTP_ERROR_GENERAL:
   default:
     fprintf(stderr, "Unknown connection error.\n");
     return 1;
   }
 
   /* Iterate over connected MTP devices */
   fprintf(stdout, "Attempting to connect device(s)\n");
   for (i = 0; i < numrawdevices; i++) {
     LIBMTP_mtpdevice_t *device;
-    LIBMTP_file_t *files;
+    LIBMTP_devicestorage_t *storage;
     char *friendlyname;
     char *syncpartner;
     char *sectime;
     char *devcert;
     uint16_t *filetypes;
     uint16_t filetypes_len;
     uint8_t maxbattlevel;
     uint8_t currbattlevel;
     int ret;
 
-    device = LIBMTP_Open_Raw_Device(&rawdevices[i]);
+    device = LIBMTP_Open_Raw_Device_Uncached(&rawdevices[i]);
     if (device == NULL) {
       fprintf(stderr, "Unable to open raw device %d\n", i);
       continue;
     }
 
     LIBMTP_Dump_Errorstack(device);
     LIBMTP_Clear_Errorstack(device);
     LIBMTP_Dump_Device_Info(device);
 
     printf("MTP-specific device properties:\n");
@@ skipping 41 matching lines @@
     ret = LIBMTP_Get_Secure_Time(device, &sectime);
     if (ret == 0 && sectime != NULL) {
       fprintf(stdout, "\nSecure Time:\n%s\n", sectime);
       free(sectime);
     } else {
       // Silently ignore - there may be devices not supporting secure time.
       LIBMTP_Clear_Errorstack(device);
     }
 
     // Device certificate XML fragment
-#if 0
-    /*
-     * This code is currently disabled: all devices say that
-     * they support getting a device certificate but a lot of
-     * them obviously doesn't, instead they crash when you try
-     * to obtain it.
-     */
-    ret = LIBMTP_Get_Device_Certificate(device, &devcert);
-    if (ret == 0 && devcert != NULL) {
-      fprintf(stdout, "\nDevice Certificate:\n%s\n", devcert);
-      free(devcert);
-    } else {
-      fprintf(stdout, "Unable to acquire device certificate, perhaps this device "
-              "does not support this\n");
-      LIBMTP_Dump_Errorstack(device);
-      LIBMTP_Clear_Errorstack(device);
+    if (rawdevices[i].device_entry.vendor_id == 0x041e) {
+      /*
+       * This code is currently disabled except for vendors we
+       * know does support it: all devices say that
+       * they support getting a device certificate but a lot of
+       * them obviously doesn't, instead they crash when you try
+       * to obtain it.
+       */
+      ret = LIBMTP_Get_Device_Certificate(device, &devcert);
+      if (ret == 0 && devcert != NULL) {
+        fprintf(stdout, "\nDevice Certificate:\n%s\n", devcert);
+        free(devcert);
+      } else {
+        fprintf(stdout, "Unable to acquire device certificate, perhaps this device "
+                "does not support this\n");
+        LIBMTP_Dump_Errorstack(device);
+        LIBMTP_Clear_Errorstack(device);
+      }
     }
-#endif
 
-    // Try to get Media player device info XML file...
-    files = LIBMTP_Get_Filelisting_With_Callback(device, NULL, NULL);
-    if (files != NULL) {
-      LIBMTP_file_t *file, *tmp;
-      file = files;
-      while (file != NULL) {
-        if (!strcmp(file->filename, "WMPInfo.xml") ||
-            !strcmp(file->filename, "WMPinfo.xml") ||
-            !strcmp(file->filename, "default-capabilities.xml")) {
+    /* Try to get Media player device info XML file... */
+    /* Loop over storages */
+    for (storage = device->storage; storage != 0; storage = storage->next) {
+      LIBMTP_file_t *files;
+
+      /* Get file listing for the root directory, no other dirs */
+      files = LIBMTP_Get_Files_And_Folders(device,
+                                           storage->id,
+                                           0);
+
+      if (files != NULL) {
+        LIBMTP_file_t *file, *tmp;
+        file = files;
+        while (file != NULL) {
+          if (!strcmp(file->filename, "WMPInfo.xml") ||
+              !strcmp(file->filename, "WMPinfo.xml") ||
+              !strcmp(file->filename, "default-capabilities.xml")) {
             if (file->item_id != 0) {
               /* Dump this file */
               FILE *xmltmp = tmpfile();
               int tmpfiledescriptor = fileno(xmltmp);
 
               if (tmpfiledescriptor != -1) {
                 int ret = LIBMTP_Get_Track_To_File_Descriptor(device,
                                                               file->item_id,
                                                               tmpfiledescriptor,
                                                               NULL,
@@ skipping 23 matching lines @@
                     LIBMTP_Clear_Errorstack(device);
                   }
                   free(buf);
                 } else {
                   LIBMTP_Dump_Errorstack(device);
                   LIBMTP_Clear_Errorstack(device);
                 }
                 fclose(xmltmp);
               }
             }
+          }
+          tmp = file;
+          file = file->next;
+          LIBMTP_destroy_file_t(tmp);
         }
-        tmp = file;
-        file = file->next;
-        LIBMTP_destroy_file_t(tmp);
       }
     }
     LIBMTP_Release_Device(device);
   } /* End For Loop */
 
   free(rawdevices);
 
   printf("OK.\n");
 
   return 0;
 }