claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Change a number of sprintf's to snprintf.

Browse Source
This commit is contained in:
R. Bernstein
2011-05-27 17:50:56 -04:00
parent 958c3cad4d
commit 9be0980337
3 changed files with 727 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/driver/MSWindows/win32_ioctl.c
View File

@@ -1,5 +1,5 @@
/* /*
Copyright (C) 2004, 2005, 2008, 2010 Rocky Bernstein <rocky@gnu.org> Copyright (C) 2004, 2005, 2008, 2010, 2011 Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -405,7 +405,7 @@ set_scsi_tuple_win32ioctl(_img_private_t *env)
&bytesReturned, &bytesReturned,
FALSE FALSE
)) { )) {
sprintf(tuple, "%d,%d,%d,%d", snprintf(tuple, sizeof(tuple) "%d,%d,%d,%d",
scsiAddress->PortNumber, scsiAddress->PortNumber,
scsiAddress->PathId, scsiAddress->PathId,
scsiAddress->TargetId, scsiAddress->TargetId,
@@ -902,7 +902,9 @@ init_win32ioctl (_img_private_t *env)
} }
env->h_device_handle = hDevice; env->h_device_handle = hDevice;
#else #else
sprintf( psz_win32_drive, "\\\\.\\%c:", env->gen.source_name[len-2] ); snprintf( psz_win32_drive, sizeof(psz_win32_drive,
"\\\\.\\%c:",
env->gen.source_name[len-2] );
env->h_device_handle = CreateFile( psz_win32_drive, env->h_device_handle = CreateFile( psz_win32_drive,
dw_access_flags, dw_access_flags,

6
lib/driver/solaris.c
View File

@@ -1,5 +1,5 @@
/* /*
Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009, 2011
Rocky Bernstein <rocky@gnu.org> Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -1038,7 +1038,7 @@ cdio_get_devices_solaris (void)
/* Check if this is a directory, if so it's probably Solaris media */ /* Check if this is a directory, if so it's probably Solaris media */
if(S_ISDIR(st.st_mode)) { if(S_ISDIR(st.st_mode)) {
sprintf(volpath, "%s/s0", globbuf.gl_pathv[i]); snprintf(volpath, sizeof(volpath), "%s/s0", globbuf.gl_pathv[i]);
if(stat(volpath, &st) == 0) if(stat(volpath, &st) == 0)
cdio_add_device_list(&drives, volpath, &i_files); cdio_add_device_list(&drives, volpath, &i_files);
}else }else
@@ -1049,7 +1049,7 @@ cdio_get_devices_solaris (void)
if(stat(DEFAULT_CDIO_DEVICE, &st) == 0) { if(stat(DEFAULT_CDIO_DEVICE, &st) == 0) {
/* Check if this is a directory, if so it's probably Solaris media */ /* Check if this is a directory, if so it's probably Solaris media */
if(S_ISDIR(st.st_mode)) { if(S_ISDIR(st.st_mode)) {
sprintf(volpath, "%s/s0", DEFAULT_CDIO_DEVICE); snprintf(volpath, sizeof(volpath), "%s/s0", DEFAULT_CDIO_DEVICE);
if(stat(volpath, &st) == 0) if(stat(volpath, &st) == 0)
cdio_add_device_list(&drives, volpath, &i_files); cdio_add_device_list(&drives, volpath, &i_files);
}else }else

27
src/cdda-player.c
View File

@@ -1,6 +1,4 @@
/* /*
$Id: cdda-player.c,v 1.50 2008/06/19 15:44:14 flameeyes Exp $
Copyright (C) 2005, 2006, 2008, 2009, 2010, 2011 Copyright (C) 2005, 2006, 2008, 2009, 2010, 2011
Rocky Bernstein <rocky@gnu.org> Rocky Bernstein <rocky@gnu.org>
@@ -308,7 +306,7 @@ xperror(const char *psz_msg)
} }
if (b_verbose) { if (b_verbose) {
sprintf(line,"%s: %s", psz_msg, strerror(errno)); snprintf(line, sizeof(line), "%s: %s", psz_msg, strerror(errno));
attron(A_STANDOUT); attron(A_STANDOUT);
mvprintw(LINE_ACTION, 0, (char *) "error : %s", line); mvprintw(LINE_ACTION, 0, (char *) "error : %s", line);
attroff(A_STANDOUT); attroff(A_STANDOUT);
@@ -671,7 +669,8 @@ play_track(track_t i_start_track, track_t i_end_track)
fprintf(stderr,"%d-%d\n",i_start_track, i_end_track-1); fprintf(stderr,"%d-%d\n",i_start_track, i_end_track-1);
cd_pause(p_cdio); cd_pause(p_cdio);
sprintf(line,"play track %d to track %d.", i_start_track, i_end_track-1); snprintf(line, sizeof(line), "play track %d to track %d.",
i_start_track, i_end_track-1);
action(line); action(line);
b_ok = (DRIVER_OP_SUCCESS == cdio_audio_play_msf(p_cdio, b_ok = (DRIVER_OP_SUCCESS == cdio_audio_play_msf(p_cdio,
&(toc[i_start_track]), &(toc[i_start_track]),
@@ -733,17 +732,17 @@ display_status(bool b_status_only)
if (!b_interactive) return; if (!b_interactive) return;
if (!b_cd) { if (!b_cd) {
sprintf(line,"no CD in drive (%s)", psz_device); snprintf(line, sizeof(line), "no CD in drive (%s)", psz_device);
} else if (i_first_track == CDIO_CDROM_LEADOUT_TRACK) { } else if (i_first_track == CDIO_CDROM_LEADOUT_TRACK) {
sprintf(line,"CD has only data tracks"); snprintf(line, sizeof(line), "CD has only data tracks");
} else if (sub.audio_status == CDIO_MMC_READ_SUB_ST_PAUSED || } else if (sub.audio_status == CDIO_MMC_READ_SUB_ST_PAUSED ||
sub.audio_status == CDIO_MMC_READ_SUB_ST_PLAY) { sub.audio_status == CDIO_MMC_READ_SUB_ST_PLAY) {
cdio_audio_get_volume(p_cdio, &audio_volume); cdio_audio_get_volume(p_cdio, &audio_volume);
if (i_vol_port < 4) { if (i_vol_port < 4) {
i_volume_level = rounded_div(audio_volume.level[i_vol_port]*100, 256); i_volume_level = rounded_div(audio_volume.level[i_vol_port]*100, 256);
sprintf(line, snprintf(line, sizeof(line),
"track %2d - %02x:%02x of %s (%02x:%02x abs) %s volume: %d", "track %2d - %02x:%02x of %s (%02x:%02x abs) %s volume: %d",
sub.track, sub.rel_addr.m, sub.rel_addr.s, sub.track, sub.rel_addr.m, sub.rel_addr.s,
cd_info[sub.track].length, cd_info[sub.track].length,
@@ -751,12 +750,13 @@ display_status(bool b_status_only)
mmc_audio_state2str(sub.audio_status), mmc_audio_state2str(sub.audio_status),
i_volume_level); i_volume_level);
} else } else
sprintf(line,"track %2d - %02x:%02x of %s (%02x:%02x abs) %s", snprintf(line, sizeof(line),
"track %2d - %02x:%02x of %s (%02x:%02x abs) %s",
sub.track, sub.rel_addr.m, sub.rel_addr.s, sub.track, sub.rel_addr.m, sub.rel_addr.s,
cd_info[sub.track].length, sub.abs_addr.m, sub.abs_addr.s, cd_info[sub.track].length, sub.abs_addr.m, sub.abs_addr.s,
mmc_audio_state2str(sub.audio_status)); mmc_audio_state2str(sub.audio_status));
} else { } else {
sprintf(line,"%s", mmc_audio_state2str(sub.audio_status)); snprintf(line, sizeof(line), "%s", mmc_audio_state2str(sub.audio_status));
} }
@@ -884,13 +884,14 @@ display_cdinfo(CdIo_t *p_cdio, track_t i_tracks, track_t i_first_track)
if (!b_interactive) return; if (!b_interactive) return;
if (!b_cd) sprintf(line, "-"); if (!b_cd) snprintf(line, sizeof(line), "-");
else { else {
len = sprintf(line, "%2u tracks (%02x:%02x min)", len = snprintf(line, sizeof(line), "%2u tracks (%02x:%02x min)",
(unsigned int) i_last_track, (unsigned int) i_last_track,
toc[i_last_track+1].m, toc[i_last_track+1].s); toc[i_last_track+1].m, toc[i_last_track+1].s);
if (i_data && i_first_track != CDIO_CDROM_LEADOUT_TRACK) if (i_data && i_first_track != CDIO_CDROM_LEADOUT_TRACK)
sprintf(line+len,", audio=%u-%u", (unsigned int) i_first_audio_track, snprintf(line+len, sizeof(line)-len, ", audio=%u-%u",
(unsigned int) i_first_audio_track,
(unsigned int) i_last_audio_track); (unsigned int) i_last_audio_track);
display_line(LINE_ARTIST, 0, "CD Artist : %s", artist); display_line(LINE_ARTIST, 0, "CD Artist : %s", artist);
@@ -997,7 +998,7 @@ display_tracks(void)
s = cdio_audio_get_msf_seconds(&toc[i+1]) s = cdio_audio_get_msf_seconds(&toc[i+1])
- cdio_audio_get_msf_seconds(&toc[i]); - cdio_audio_get_msf_seconds(&toc[i]);
read_subchannel(p_cdio); read_subchannel(p_cdio);
sprintf(line, "%2d %02d:%02d %s ", i, snprintf(line, sizeof(line), "%2d %02d:%02d %s ", i,
s / CDIO_CD_SECS_PER_MIN, s % CDIO_CD_SECS_PER_MIN, s / CDIO_CD_SECS_PER_MIN, s % CDIO_CD_SECS_PER_MIN,
( ( sub.audio_status == CDIO_MMC_READ_SUB_ST_PLAY || ( ( sub.audio_status == CDIO_MMC_READ_SUB_ST_PLAY ||
sub.audio_status == CDIO_MMC_READ_SUB_ST_PAUSED ) && sub.audio_status == CDIO_MMC_READ_SUB_ST_PAUSED ) &&