[svn] Update the license to include the OpenSSL exception.

[wget] / src / log.c

diff --git a/src/log.c b/src/log.c
index aa38348b0c74d0cce5d8d3230f9b7c89089d854f..e3e697b0b66d9614733920599e86bc09a9956ae4 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -15,10 +15,30 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  */
 
 #include <config.h>
 
+/* Use stdarg only if the compiler supports ANSI C and stdarg.h is
+   present.  We check for both because there are configurations where
+   stdarg.h exists, but doesn't work. */
+#undef WGET_USE_STDARG
+#ifdef __STDC__
+# ifdef HAVE_STDARG_H
+#  define WGET_USE_STDARG
+# endif
+#endif
+
 #include <stdio.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
@@ -26,8 +46,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 # include <strings.h>
 #endif
 #include <stdlib.h>
-#ifdef HAVE_STDARG_H
-# define WGET_USE_STDARG
+#ifdef WGET_USE_STDARG
 # include <stdarg.h>
 #else
 # include <varargs.h>
@@ -307,6 +326,7 @@ logputs (enum log_options o, const char *s)
   check_redirect_output ();
   if (!(fp = get_log_fp ()))
     return;
+  CHECK_VERBOSE (o);
 
   fputs (s, fp);
   if (save_context_p)