Changeset 14317

Timestamp:

Jul 4, 2014, 3:23:27 AM (8 years ago)

Author:

jordan

Message:

(trunk, libT) #5656 'Problems renaming files' -- fixed, patch by rb07

Location:

trunk/libtransmission

Files:

• rename-test.c (modified) (2 diffs)
• torrent.c (modified) (2 diffs)

trunk/libtransmission/rename-test.c

@@ -369 +369 @@
     {
       check_streq (expected_files[i], files[i].name);
-      check (testFileExistsAndConsistsOfThisString (tor, 1, expected_contents[1]));
+      check (testFileExistsAndConsistsOfThisString (tor, i, expected_contents[i]));
     }
   check (files[0].is_renamed == false);
@@ -440 +440 @@
     }
 
+  /**
+  ***  Test renaming prefixes (shouldn't work)
+  **/
+
+  tr_torrentRemove (tor, false, NULL);
+  do {
+    tr_wait_msec (10);
+  } while (0);
+  ctor = tr_ctorNew (session);
+  tor = create_torrent_from_base64_metainfo (ctor,
+    "ZDEwOmNyZWF0ZWQgYnkyNTpUcmFuc21pc3Npb24vMi42MSAoMTM0MDcpMTM6Y3JlYXRpb24gZGF0"
+    "ZWkxMzU4NTU1NDIwZTg6ZW5jb2Rpbmc1OlVURi04NDppbmZvZDU6ZmlsZXNsZDY6bGVuZ3RoaTI4"
+    "ZTQ6cGF0aGw3OkZlbGluYWU4OkFjaW5vbnl4NzpDaGVldGFoNzpDaGVzdGVyZWVkNjpsZW5ndGhp"
+    "MTJlNDpwYXRobDc6RmVsaW5hZTU6RmVsaXM1OmNhdHVzNTpLeXBoaWVlZDY6bGVuZ3RoaTZlNDpw"
+    "YXRobDc6RmVsaW5hZTU6RmVsaXM1OmNhdHVzNzpTYWZmcm9uZWVkNjpsZW5ndGhpMjFlNDpwYXRo"
+    "bDExOlBhbnRoZXJpbmFlODpQYW50aGVyYTU6VGlnZXI0OlRvbnllZWU0Om5hbWU3OkZlbGlkYWUx"
+    "MjpwaWVjZSBsZW5ndGhpMzI3NjhlNjpwaWVjZXMyMDp27buFkmy8ICfNX4nsJmt0Ckm2Ljc6cHJp"
+    "dmF0ZWkwZWVl");
+  check (tr_isTorrent (tor));
+  files = tor->info.files;
+
+  /* rename prefix of top */
+  check_int_eq (EINVAL, torrentRenameAndWait (tor, "Feli", "FelidaeX"));
+  check_streq (tor->info.name, "Felidae");
+  check (files[0].is_renamed == false);
+  check (files[1].is_renamed == false);
+  check (files[2].is_renamed == false);
+  check (files[3].is_renamed == false);
+
+  /* rename false path */
+  check_int_eq (EINVAL, torrentRenameAndWait (tor, "Felidae/FelinaeX", "Genus Felinae"));
+  check_streq (tor->info.name, "Felidae");
+  check (files[0].is_renamed == false);
+  check (files[1].is_renamed == false);
+  check (files[2].is_renamed == false);
+  check (files[3].is_renamed == false);
+
   /***
   ****

trunk/libtransmission/torrent.c

@@ -3593 +3593 @@
       const char * name = tor->info.files[i].name;
       const size_t len = strlen (name);
-      if ((len >= oldpath_len) && !memcmp (oldpath, name, oldpath_len))
+      if ((len == oldpath_len || (len > oldpath_len && name[oldpath_len] == '/')) &&
+          !memcmp (oldpath, name, oldpath_len))
         indices[n++] = i;
     }
@@ -3736 +3737 @@
       if (n == 0)
         {
-          errno = EINVAL;
+          error = EINVAL;
         }
       else