Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv31308/core/oss
Modified Files:
mixer_oss.c
Log Message:
Added strlcpy() strlcat() functions
Index: mixer_oss.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/mixer_oss.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mixer_oss.c 27 Mar 2003 10:15:46 -0000 1.21
+++ mixer_oss.c 30 May 2003 12:28:33 -0000 1.22
@@ -85,8 +85,8 @@
struct mixer_info info;
memset(&info, 0, sizeof(info));
- strncpy(info.id, mixer && mixer->id[0] ? mixer->id : card->driver,
sizeof(info.id) - 1);
- strncpy(info.name, mixer && mixer->name[0] ? mixer->name : card->mixername,
sizeof(info.name) - 1);
+ strlcpy(info.id, mixer && mixer->id[0] ? mixer->id : card->driver,
sizeof(info.id));
+ strlcpy(info.name, mixer && mixer->name[0] ? mixer->name : card->mixername,
sizeof(info.name));
info.modify_counter = card->mixer_oss_change_count;
if (copy_to_user(_info, &info, sizeof(info)))
return -EFAULT;
@@ -101,8 +101,8 @@
_old_mixer_info info;
memset(&info, 0, sizeof(info));
- strncpy(info.id, mixer && mixer->id[0] ? mixer->id : card->driver,
sizeof(info.id) - 1);
- strncpy(info.name, mixer && mixer->name[0] ? mixer->name : card->mixername,
sizeof(info.name) - 1);
+ strlcpy(info.id, mixer && mixer->id[0] ? mixer->id : card->driver,
sizeof(info.id));
+ strlcpy(info.name, mixer && mixer->name[0] ? mixer->name : card->mixername,
sizeof(info.name));
if (copy_to_user(_info, &info, sizeof(info)))
return -EFAULT;
return 0;
@@ -1215,11 +1215,10 @@
}
mixer->oss_dev_alloc = 1;
mixer->card = card;
- if (*card->mixername) {
- strncpy(mixer->name, card->mixername, sizeof(mixer->name) - 1);
- mixer->name[sizeof(mixer->name)-1] = 0;
- } else
- strcpy(mixer->name, name);
+ if (*card->mixername)
+ strlcpy(mixer->name, card->mixername, sizeof(mixer->name));
+ else
+ strlcpy(mixer->name, name, sizeof(mixer->name));
#ifdef SNDRV_OSS_INFO_DEV_MIXERS
snd_oss_info_register(SNDRV_OSS_INFO_DEV_MIXERS,
card->number,
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
