Property changes on: .
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
Makefile
Makefile.in
aclocal.m4
audio2tape
autom4te.cache
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
createhdf
depcomp
fmfconv
fuse-utils.qpg
install-sh
libtool
listbasic
ltmain.sh
missing
mkinstalldirs
profile2map
raw2hdf
rzxcheck
rzxdump
rzxtool
scl2trd
snap2tzx
snapconv
stamp-h
stamp-h.in
stamp-h1
tape2wav
tapeconv
tzxlist
+ .deps
.libs
Makefile
Makefile.in
aclocal.m4
audio2tape
autom4te.cache
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
createhdf
depcomp
fmfconv
fuse-utils.qpg
install-sh
libtool
listbasic
ltmain.sh
missing
mkinstalldirs
profile2map
raw2hdf
rzxcheck
rzxdump
rzxtool
scl2trd
snap2tzx
snapconv
stamp-h
stamp-h.in
stamp-h1
tape2wav
tapeconv
tzxlist
*.exe
Index: fmfconv.c
===================================================================
--- fmfconv.c (revision 4361)
+++ fmfconv.c (working copy)
@@ -37,10 +37,6 @@
#endif /* #ifdef HAVE_STRINGS_H */
#include <fcntl.h>
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-
#include "libspectrum.h"
#include "movie_tables.h"
@@ -619,20 +615,19 @@
if( out_t != TYPE_FFMPEG )
#endif
{
-#ifdef HAVE_TERMIOS_H
- struct termios term;
- if( !tcgetattr( STDOUT_FILENO, &term ) ) {
+
+ if( isatty( fileno( stdout ) ) ) {
out_t = TYPE_NONE;
out = NULL;
out_name = "(-=null=-)";
} else {
-#endif
out_t = TYPE_YUV; /* default to YUV */
out = stdout;
out_name = "(-=stdout=-)";
-#ifdef HAVE_TERMIOS_H
+#ifdef WIN32
+ setmode( fileno( stdout ), O_BINARY );
+#endif /* #ifdef WIN32 */
}
-#endif
}
if( out_t == TYPE_NONE ) {
@@ -1715,6 +1710,19 @@
printe ("Too many filenames...\n");
return ERR_BAD_PARAM;
}
+
+ if( !help_exit && !inp_name ) {
+ if( isatty( fileno( stdin ) ) ) {
+ printe( "%s: no input file specified\n", "fmfconv" );
+ fprintf( stderr, "Try `fmfconv --help' for more information.\n" );
+ help_exit = 1;
+ }
+#ifdef WIN32
+ else {
+ setmode( fileno( stdin ), O_BINARY );
+ }
+#endif /* #ifdef WIN32 */
+ }
return 0;
}