summaryrefslogtreecommitdiff
path: root/apps/iap.c
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2009-07-14 13:57:45 +0000
committerNils Wallménius <nils@rockbox.org>2009-07-14 13:57:45 +0000
commit3d4701a6e41616cf581a297bab1451cf2db70249 (patch)
treef845837c96ffbed7d59ddf8308f3b3e7c40cb8c9 /apps/iap.c
parentc2900a1bacd5d98b57a0d15ea2add1bc08764057 (diff)
downloadrockbox-3d4701a6e41616cf581a297bab1451cf2db70249.tar.gz
rockbox-3d4701a6e41616cf581a297bab1451cf2db70249.zip
FS#10080
* Move strncpy() from core to the pluginlib * Introduce strlcpy() and use that instead in most places (use memcpy in a few) in core and some plugins * Drop strncpy() from the codec api as no codec used it * Bump codec and plugin api versions git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21863 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/iap.c')
-rw-r--r--apps/iap.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/iap.c b/apps/iap.c
index 51f5e5900b..592bbdbbf8 100644
--- a/apps/iap.c
+++ b/apps/iap.c
@@ -495,6 +495,7 @@ void iap_handlepkt(void)
495 unsigned char data[70] = {0x04, 0x00, 0xFF}; 495 unsigned char data[70] = {0x04, 0x00, 0xFF};
496 struct mp3entry id3; 496 struct mp3entry id3;
497 int fd; 497 int fd;
498 size_t len;
498 long tracknum = (signed long)serbuf[4] << 24 | 499 long tracknum = (signed long)serbuf[4] << 24 |
499 (signed long)serbuf[5] << 16 | 500 (signed long)serbuf[5] << 16 |
500 (signed long)serbuf[6] << 8 | serbuf[7]; 501 (signed long)serbuf[6] << 8 | serbuf[7];
@@ -520,16 +521,16 @@ void iap_handlepkt(void)
520 switch(serbuf[3]) 521 switch(serbuf[3])
521 { 522 {
522 case 0x20: 523 case 0x20:
523 strncpy((char *)&data[3], id3.title, 64); 524 len = strlcpy((char *)&data[3], id3.title, 64);
524 iap_send_pkt(data, 4+strlen(id3.title)); 525 iap_send_pkt(data, 4+len);
525 break; 526 break;
526 case 0x22: 527 case 0x22:
527 strncpy((char *)&data[3], id3.artist, 64); 528 len = strlcpy((char *)&data[3], id3.artist, 64);
528 iap_send_pkt(data, 4+strlen(id3.artist)); 529 iap_send_pkt(data, 4+len);
529 break; 530 break;
530 case 0x24: 531 case 0x24:
531 strncpy((char *)&data[3], id3.album, 64); 532 len = strlcpy((char *)&data[3], id3.album, 64);
532 iap_send_pkt(data, 4+strlen(id3.album)); 533 iap_send_pkt(data, 4+len);
533 break; 534 break;
534 } 535 }
535 break; 536 break;