Revert "Uprev libmtp to 1.1.12"

examples/sendtr.c

 /**
  * \file sendtr.c
  * Example program to send a music track to a device.
  * This program is derived from the exact equivalent in libnjb.
  * based on Enrique Jorreto Ledesma's work on the original program by
  * Shaun Jackman and Linus Walleij.
  *
  * Copyright (C) 2003-2010 Linus Walleij <triad@df.lth.se>
  * Copyright (C) 2003-2005 Shaun Jackman
  * Copyright (C) 2003-2005 Enrique Jorrete Ledesma
@@ skipping 168 matching lines @@
   } else {
     printf("success!\n");
   }
   return ret;
 }
 
 int sendtrack_function(char * from_path, char * to_path, char *partist, char *palbumartist, char *ptitle, char *pgenre, char *palbum, char *pcomposer, uint16_t tracknum, uint16_t length, uint16_t year, uint32_t storageid, uint16_t quiet)
 {
   char *filename, *parent;
   char artist[80], albumartist[80], title[80], genre[80], album[80], composer[80];
-  char *to_path_copy = NULL;
   char num[80];
   uint64_t filesize;
   uint32_t parent_id = 0;
   struct stat sb;
   LIBMTP_track_t *trackmeta;
   LIBMTP_album_t *albuminfo;
   int ret;
 
   printf("Sending track %s to %s\n", from_path, to_path);
 
-  to_path_copy = strdup(to_path);
-  parent = dirname(to_path_copy);
+  trackmeta = LIBMTP_new_track_t();
+  albuminfo = LIBMTP_new_album_t();
+
+  parent = dirname(strdup(to_path));
+  filename = basename(strdup(to_path));
   parent_id = parse_path (parent,files,folders);
   if (parent_id == -1) {
-    free (to_path_copy);
     printf("Parent folder could not be found, skipping\n");
     return 1;
   }
-  strcpy (to_path_copy,to_path);
-  filename = basename(to_path_copy);
 
   if (stat(from_path, &sb) == -1) {
     fprintf(stderr, "%s: ", from_path);
     perror("stat");
-    free (to_path_copy);
     return 1;
   }
 
-  if (!S_ISREG(sb.st_mode)) {
-    free (to_path_copy);
+  if (!S_ISREG(sb.st_mode))
     return 0;
-  }
 
   filesize = sb.st_size;
-
-  trackmeta = LIBMTP_new_track_t();
   trackmeta->filetype = find_filetype (from_path);
   if (!LIBMTP_FILETYPE_IS_TRACK(trackmeta->filetype)) {
     printf("Not a valid track codec: \"%s\"\n", LIBMTP_Get_Filetype_Description(trackmeta->filetype));
-    LIBMTP_destroy_track_t(trackmeta);
-    free (to_path_copy);
     return 1;
   }
 
   if ((ptitle == NULL) && (quiet == 0)) {
     if ( (ptitle = prompt("Title", title, 80, 0)) != NULL )
       if (!strlen(ptitle)) ptitle = NULL;
   }
 
   if ((palbum == NULL) && (quiet == 0)) {
     if ( (palbum = prompt("Album", album, 80, 0)) != NULL )
@@ skipping 43 matching lines @@
     else
       length = strtoul(pnum, 0, 10);
   }
 
   printf("Sending track:\n");
   printf("Codec:     %s\n", LIBMTP_Get_Filetype_Description(trackmeta->filetype));
   if (ptitle) {
     printf("Title:     %s\n", ptitle);
     trackmeta->title = strdup(ptitle);
   }
-
-  albuminfo = LIBMTP_new_album_t();
-
   if (palbum) {
     printf("Album:     %s\n", palbum);
     trackmeta->album = strdup(palbum);
     albuminfo->name = strdup(palbum);
   }
   if (palbumartist) {
     printf("Album artist:    %s\n", palbumartist);
     albuminfo->artist = strdup(palbumartist);
   }
   if (partist) {
@@ skipping 68 matching lines @@
   } else {
     printf("New track ID: %d\n", trackmeta->item_id);
   }
 
   /* Add here add to album call */
   if (palbum)
     ret = add_track_to_album(albuminfo, trackmeta);
 
   LIBMTP_destroy_album_t(albuminfo);
   LIBMTP_destroy_track_t(trackmeta);
-  free (to_path_copy);
 
   return ret;
 }
 
 int sendtrack_command (int argc, char **argv) {
-  int opt, ret;
+  int opt;
   extern int optind;
   extern char *optarg;
   char *partist = NULL;
   char *palbumartist = NULL;
   char *pcomposer = NULL;
   char *ptitle = NULL;
   char *pgenre = NULL;
   char *pcodec = NULL;
   char *palbum = NULL;
   uint16_t tracknum = 0;
   uint16_t length = 0;
   uint16_t year = 0;
   uint16_t quiet = 0;
   uint32_t storageid = 0;
   while ( (opt = getopt(argc, argv, "qD:t:a:A:w:l:c:g:n:d:y:s:")) != -1 ) {
     switch (opt) {
     case 't':
-      free (ptitle);
       ptitle = strdup(optarg);
       break;
     case 'a':
-      free (partist);
       partist = strdup(optarg);
       break;
     case 'A':
-      free (palbumartist);
       palbumartist = strdup(optarg);
       break;
     case 'w':
-      free (pcomposer);
       pcomposer = strdup(optarg);
       break;
     case 'l':
-      free (palbum);
       palbum = strdup(optarg);
       break;
     case 'c':
-      free (pcodec);
       pcodec = strdup(optarg); // FIXME: DSM check for MP3, WAV or WMA
       break;
     case 'g':
-      free (pgenre);
       pgenre = strdup(optarg);
       break;
     case 'n':
       tracknum = atoi(optarg);
       break;
     case 's':
       storageid = (uint32_t) strtoul(optarg, NULL, 0);
       break;
     case 'd':
       length = atoi(optarg);
       break;
     case 'y':
       year = atoi(optarg);
       break;
     case 'q':
       quiet = 1;
       break;
     default:
       sendtrack_usage();
     }
   }
   argc -= optind;
   argv += optind;
 
   if ( argc != 2 ) {
     printf("You need to pass a filename and destination.\n");
     sendtrack_usage();
-    ret = 0;
-  } else {
-    checklang();
-    printf("%s,%s,%s,%s,%s,%s,%s,%s,%d%d,%d,%u,%d\n",argv[0],argv[1],partist,palbumartist,ptitle,pgenre,palbum,pcomposer,tracknum, length, year, storageid, quiet);
-    ret = sendtrack_function(argv[0],argv[1],partist,palbumartist,ptitle,pgenre,palbum,pcomposer, tracknum, length, year, storageid, quiet);
+    return 0;
   }
-  free (ptitle);
-  free (partist);
-  free (palbumartist);
-  free (pcomposer);
-  free (palbum);
-  free (pcodec);
-  free (pgenre);
-  return ret;
+
+  checklang();
+
+  printf("%s,%s,%s,%s,%s,%s,%s,%s,%d%d,%d,%u,%d\n",argv[0],argv[1],partist,palbumartist,ptitle,pgenre,palbum,pcomposer,tracknum, length, year, storageid, quiet);
+  return sendtrack_function(argv[0],argv[1],partist,palbumartist,ptitle,pgenre,palbum,pcomposer, tracknum, length, year, storageid, quiet);
 }