Bump the default Timeout to 15 minutes as well (Issue #5570)

[thirdparty/cups.git] / man / mantohtml.c

diff --git a/man/mantohtml.c b/man/mantohtml.c
index 195ae432048fe5d013c3ec47e196afa4e4909cde..2a9353a9f76500747dcae7660205ec427c0245e8 100644 (file)
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -1,14 +1,10 @@
 /*
  * Man page to HTML conversion program.
  *
- * Copyright 2007-2010, 2014 by Apple Inc.
+ * Copyright 2007-2017 by Apple Inc.
  * Copyright 2004-2006 by Easy Software Products.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
  */
 
 /*
@@ -513,7 +509,7 @@ main(int  argc,                             /* I - Number of command-line args */
        float amount = 3.0;             /* Indentation */
 
         if (line[3])
-          amount = atof(line + 4);
+          amount = (float)atof(line + 4);
 
        fputs(end_fonts[font], outfile);
        font = 0;
@@ -559,7 +555,7 @@ main(int  argc,                             /* I - Number of command-line args */
        float amount = 3.0;             /* Indentation */
 
         if (line[3])
-          amount = atof(line + 4);
+          amount = (float)atof(line + 4);
 
        fputs(end_fonts[font], outfile);
        font = 0;
@@ -592,7 +588,7 @@ main(int  argc,                             /* I - Number of command-line args */
        float amount = 3.0;             /* Indentation */
 
         if (line[3])
-          amount = atof(line + 4);
+          amount = (float)atof(line + 4);
 
        fputs(end_fonts[font], outfile);
        font = 0;
@@ -680,7 +676,7 @@ main(int  argc,                             /* I - Number of command-line args */
           lineptr ++;
 
         if (isdigit(*lineptr & 255))
-          amount = atof(lineptr);
+          amount = (float)atof(lineptr);
 
         if (newlist && list && strcmp(newlist, list))
         {
@@ -1153,8 +1149,11 @@ html_fputs(const char *s,                /* I  - String */
       }
       else
       {
-        if (*s != '\\' && *s == '\"' && *s == '\'' && *s == '-')
+        if (*s != '\\' && *s != '\"' && *s != '\'' && *s != '-')
+        {
           fprintf(stderr, "mantohtml: Unrecognized escape \"\\%c\" ignored.\n", *s);
+          html_putc('\\', fp);
+        }
 
         html_putc(*s++, fp);
       }