diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2016-08-09 18:11:49 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2019-08-17 15:30:53 +0200 |
| commit | d5966671d8b2ccbf1350589f2f9bd2f50835474e (patch) | |
| tree | 0ec6ae13144b74147acd179d1f495e36ac4bbecb | |
| parent | 7a2def69b1ef279ea750c661b0f95a24b3f1574f (diff) | |
Build mantohtml with the build architecture compiler
mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.
Bug-Debian: https://bugs.debian.org/837936
| -rw-r--r-- | Makedefs.in | 1 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | man/Makefile | 6 | ||||
| -rw-r--r-- | man/mantohtml.c | 15 |
4 files changed, 22 insertions, 9 deletions
diff --git a/Makedefs.in b/Makedefs.in index 83eae7ce8..4f6247a68 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -25,6 +25,7 @@ CUPS_VERSION = @CUPS_VERSION@ AR = @AR@ AWK = @AWK@ CC = @LIBTOOL_CC@ @CC@ +CC_FOR_BUILD = @CC_FOR_BUILD@ CHMOD = @CHMOD@ CXX = @LIBTOOL_CXX@ @CXX@ DSO = @DSO@ diff --git a/configure.ac b/configure.ac index 776259933..864ba340a 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,15 @@ sinclude(config-scripts/cups-common.m4) sinclude(config-scripts/cups-directories.m4) sinclude(config-scripts/cups-manpages.m4) +AC_MSG_CHECKING([for build system compiler]) +if test "$cross_compiling" = yes; then + CC_FOR_BUILD=${CC_FOR_BUILD-cc} +else + CC_FOR_BUILD=${CC} +fi +AC_MSG_RESULT(${CC_FOR_BUILD}) +AC_SUBST(CC_FOR_BUILD) + sinclude(config-scripts/cups-sharedlibs.m4) sinclude(config-scripts/cups-libtool.m4) sinclude(config-scripts/cups-compiler.m4) diff --git a/man/Makefile b/man/Makefile index 4b10dffc5..3c3270ade 100644 --- a/man/Makefile +++ b/man/Makefile @@ -226,7 +226,5 @@ html: $(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml ./mantohtml `basename $$file .$(MAN8EXT)`.man >../doc/help/man-`basename $$file .$(MAN8EXT)`.html; \ done -mantohtml: mantohtml.o ../cups/$(LIBCUPSSTATIC) - $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o \ - ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ - $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) +mantohtml: mantohtml.c + $(CC_FOR_BUILD) -o $@ $< diff --git a/man/mantohtml.c b/man/mantohtml.c index bf7ba5fe8..80acf5512 100644 --- a/man/mantohtml.c +++ b/man/mantohtml.c @@ -15,8 +15,10 @@ * Include necessary headers. */ -#include <cups/string-private.h> -#include <cups/array-private.h> +#include <ctype.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <unistd.h> @@ -815,7 +817,8 @@ main(int argc, /* I - Number of command-line args */ * Anchor for HTML output... */ - strlcpy(anchor, line + 4, sizeof(anchor)); + strncpy(anchor, line + 4, sizeof(anchor) - 1); + anchor[sizeof(anchor) - 1] = '\0'; } else if (strncmp(line, ".\\\"", 3)) { @@ -944,7 +947,8 @@ html_alternate(const char *s, /* I - String */ manfile[1024], /* Man page filename */ manurl[1024]; /* Man page URL */ - strlcpy(name, s, sizeof(name)); + strncpy(name, s, sizeof(name) - 1); + name[sizeof(name) - 1] = '\0'; if ((size_t)(end - s) < sizeof(name)) name[end - s] = '\0'; @@ -1177,7 +1181,8 @@ html_fputs(const char *s, /* I - String */ if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')') end --; - strlcpy(temp, s, sizeof(temp)); + strncpy(temp, s, sizeof(temp) - 1); + temp[sizeof(temp) - 1] = '\0'; if ((size_t)(end -s) < sizeof(temp)) temp[end - s] = '\0'; |