PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add check to ensure -O is used with stdout

This commit is contained in:
ars-ka0s 2023-01-18 00:09:45 -06:00
parent 41b32703b1
commit f698b93aa8
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/audio.c
View File

@ -458,6 +458,11 @@ int audio_open (struct audio_s *pa)
*/
if (strcasecmp(pa->adev[a].adevice_out, "stdout") == 0 || strcmp(pa->adev[a].adevice_out, "-") == 0) {
adev[a].g_audio_out_type = AUDIO_OUT_TYPE_STDOUT;
if (!dw_printf_redirected()) {
text_color_set (DW_COLOR_ERROR);
dw_printf ("stdout must only be used with the -O option\n");
return (-1);
}
} else {
adev[a].g_audio_out_type = AUDIO_OUT_TYPE_SOUNDCARD;
}

5
src/audio_win.c
View File

@ -354,6 +354,11 @@ int audio_open (struct audio_s *pa)
*/
if (strcasecmp(pa->adev[a].adevice_out, "stdout") == 0 || strcmp(pa->adev[a].adevice_out, "-") == 0) {
A->g_audio_out_type = AUDIO_OUT_TYPE_STDOUT;
if (!dw_printf_redirected()) {
text_color_set (DW_COLOR_ERROR);
dw_printf ("stdout must only be used with the -O option\n");
return (-1);
}
/* Change - to stdout for readability. */
strlcpy (pa->adev[a].adevice_out, "stdout", sizeof(pa->adev[a].adevice_out));
} else {

5
src/textcolor.c
View File

@ -388,7 +388,10 @@ int dw_printf (const char *fmt, ...)
return (len);
}
int dw_printf_redirected ()
{
return g_dw_printf_dest != stdout;
}
#if TESTC
main ()

2
src/textcolor.h
View File

@ -55,4 +55,6 @@ int dw_printf (const char *fmt, ...)
__attribute__((format(printf,1,2))); /* gnu C lib. */
#endif
int dw_printf_redirected ();
#endif