Don't depend on implicit boolean conversion for streams.

Fix a header guard to reduce warnings.

3 files changed, 64 insertions, 1 deletions

diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo
index 21dd4001226..b3dec84c73d 100644
--- a/ham/fldigi/distinfo
+++ b/ham/fldigi/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.15 2013/09/13 06:35:55 mef Exp $
+$NetBSD: distinfo,v 1.16 2013/09/17 21:12:25 joerg Exp $
 
 SHA1 (fldigi-3.21.76.tar.gz) = c5affcedd19410d02e176e38914787278a21ec44
 RMD160 (fldigi-3.21.76.tar.gz) = b9261eb62b75c238dc3ad790b66e35f52255d29b
 Size (fldigi-3.21.76.tar.gz) = 2537663 bytes
 SHA1 (patch-src_dominoex_dominoex.cxx) = 39d2d2e75497ec5264148bc4927278df5adaa84d
+SHA1 (patch-src_include_logsupport.h) = f5981f5dde6c9dc4f6df9318ceaff908a142e795
 SHA1 (patch-src_include_qrunner.h) = 5dac7e9fd52f10c66978a854963bd03d39a729d0
+SHA1 (patch-src_include_strutil.h) = b12f49bddc839991a9dac8f0d38439c3e34c268f
 SHA1 (patch-src_logbook_logsupport.cxx) = bffff9fe6ee6f07596fa1e65208377d17b822263
 SHA1 (patch-src_misc_configuration.cxx) = 4f1940b0ff9d51418b37d01636c1a45f9a392943
 SHA1 (patch-src_misc_dxcc.cxx) = 23533d5062d731b56c7f7b2e9e4cac0b2b4f7194
diff --git a/ham/fldigi/patches/patch-src_include_logsupport.h b/ham/fldigi/patches/patch-src_include_logsupport.h
new file mode 100644
index 00000000000..8e86da7268c
--- /dev/null
+++ b/ham/fldigi/patches/patch-src_include_logsupport.h
@@ -0,0 +1,11 @@
+$NetBSD: patch-src_include_logsupport.h,v 1.1 2013/09/17 21:12:25 joerg Exp $
+
+--- src/include/logsupport.h.orig	2013-09-17 19:27:33.000000000 +0000
++++ src/include/logsupport.h
+@@ -1,5 +1,5 @@
+ #ifndef SUPPORT_H
+-#define SUPPORT_h
++#define SUPPORT_H
+ 
+ #include <string>
+ 
diff --git a/ham/fldigi/patches/patch-src_include_strutil.h b/ham/fldigi/patches/patch-src_include_strutil.h
new file mode 100644
index 00000000000..42fdce7d35d
--- /dev/null
+++ b/ham/fldigi/patches/patch-src_include_strutil.h
@@ -0,0 +1,50 @@
+$NetBSD: patch-src_include_strutil.h,v 1.1 2013/09/17 21:12:25 joerg Exp $
+
+--- src/include/strutil.h.orig	2013-09-17 19:23:48.000000000 +0000
++++ src/include/strutil.h
+@@ -207,7 +207,8 @@ inline bool read_until_delim( char delim
+ /// Reads a string up to the given delimiter.
+ inline bool read_until_delim( char delim, std::istream & istrm, std::string & ref )
+ {
+-	return std::getline( istrm, ref, delim );
++	std::getline( istrm, ref, delim );
++	return istrm.good() || istrm.eof();
+ }
+ 
+ /// For reading from a string with tokens separated by a char. Used to load CSV files.
+@@ -220,7 +221,7 @@ bool read_until_delim( char delim, std::
+ 	}
+ 	imemstream sstrm( parsed_str );
+ 	sstrm >> ref ;
+-	return sstrm ;
++	return sstrm.good() || sstrm.eof();
+ }
+ 
+ /// Same, with a default value if there is nothing to read.
+@@ -237,7 +238,7 @@ bool read_until_delim( char delim, std::
+ 	}
+ 	imemstream sstrm( parsed_str );
+ 	sstrm >> ref ;
+-	return sstrm ;
++	return sstrm.good() || sstrm.eof();
+ }
+ 
+ /// For reading from a string with tokens separated by a char to a fixed-size array.
+@@ -246,7 +247,7 @@ bool read_until_delim( char delim, std::
+ {
+ 	istrm.getline( ref, DtTyp< Tp >::Size, delim );
+ 	// Should we return an error if buffer is too small?
+-	return istrm ;
++	return istrm.good() || istrm.eof();
+ }
+ 
+ /// Same, with a default value if there is nothing to read. Fixed-size array.
+@@ -259,7 +260,7 @@ bool read_until_delim( char delim, std::
+ 		strncpy( ref, dflt, DtTyp< Tp >::Size - 1 );
+ 	}
+ 	// Should we return an error if buffer is too small?
+-	return istrm;
++	return istrm.good() || istrm.eof();
+ }
+ 
+ // ----------------------------------------------------------------------------