Thank you to anyone who has already donated - your generous donations helped make three months of treatment possible.

My brother Nate continues to fight stage IV Hodgkin's lymphoma. He's just 31, with a wife and baby girl. They have no active income (since he's been unable to return to work), no insurance, and cannot afford the treatment he needs. Nate and his family need your help. Please consider a donation, every dollar helps. Thanks.

Read Nate's story Support Nate by buying an official Pastie t-shirt Hide this message

Document@2x
|
Chain_link@2x
|
Arrow_down@2x
|
Spiral_paper@2x
A A A

Diff       Report abuse 

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46

@@ -791,28 +804,37 @@
     tracks = (struct track_data*)(track_names + borrowed);
     while (rb->tagcache_get_next(&tcs))
     {
+        int len = 0, fn_off = 0;
+
         avail -= sizeof(struct track_data);
         track_num = rb->tagcache_get_numeric(&tcs, tag_tracknumber) - 1;
         disc_num = rb->tagcache_get_numeric(&tcs, tag_discnumber);
-        int len = 0;
+
         if (disc_num < 0)
             disc_num = 0;
 retry:
         if (track_num >= 0)
         {
             if (disc_num)
-                len = 1 + rb->snprintf(track_names + string_index , avail,
-                    "%d.%02d:  %s", disc_num, track_num + 1, tcs.result);
+                fn_off = 1 + rb->snprintf(track_names + string_index , avail,
+                    "%d.%02d: %s", disc_num, track_num + 1, tcs.result);
             else
-                len = 1 + rb->snprintf(track_names + string_index , avail,
-                    "%d:  %s", track_num + 1, tcs.result);
+                fn_off = 1 + rb->snprintf(track_names + string_index , avail,
+                    "%d: %s", track_num + 1, tcs.result);
         }
         else
         {
             track_num = 0;
-            len = tcs.result_len;
-            rb->strncpy(track_names + string_index, tcs.result, avail);
+            fn_off = 1 + rb->snprintf(track_names + string_index, avail,
+                "%s", tcs.result);
         }
+        rb->tagcache_retrieve(&tcs, tcs.idx_id, tag_filename,
+                track_names + string_index + fn_off, avail);
+        len = fn_off + rb->strlen(track_names + string_index + fn_off) + 1;
+        /* make sure track name and file name are really split by a \0, else
+         * get_track_name might fail */
+        *(track_names + string_index + fn_off -1) = '\0';
+
         if (len > avail)
         {
             while (len > avail)