Attachment #154339 for bug #223667

Lines 4-10 Link Here

(-)man2html.orig/scripts/cgi-bin/man/man2html (-1 / +1 lines)
4	# aeb@cwi.nl - 980109	4	# aeb@cwi.nl - 980109
5		5
6	MAN2HTML="/usr/bin/man2html"	6	MAN2HTML="/usr/bin/man2html"
7	MANX="/home/httpd/cgi-aux/man/man.aux"	7	MANX="/usr/share/man-cgi-aux/man.aux"
8		8
9	# Do we need lynxcgi URLs? For the moment our criterion is	9	# Do we need lynxcgi URLs? For the moment our criterion is
10	# 1) HTTP_USER_AGENT=Lynx* and 2) HTTP_HOST is unset.	10	# 1) HTTP_USER_AGENT=Lynx* and 2) HTTP_HOST is unset.





BEGIN {

  searchdocument = "/usr/share/man-cgi-aux/mansearch.aux";
  quote = ENVIRON["QUOTE"];
  cgipath = ENVIRON["CG"];
  sedcmd = ENVIRON["SED"];

  }
				# Have to be careful to single quote this
				# string later.
  gsub(/[^a-zA-Z0-9\-_+ \t\/@%:;,$*|]/, " ", string);

  string = removeopts(string);

  gsub(/[^a-zA-Z0-9\-_+ \t\/@%:,]/, " ", options);

  if (!string) {
    if (system("test -r " searchdocument ) != 0) {

Lines 1-6 Link Here

(-)man2html.orig/scripts/cgi-bin/man/mansearchhelp (-1 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2	MAN2HTML=/usr/bin/man2html	2	MAN2HTML=/usr/bin/man2html
3	MANSH=/home/httpd/cgi-aux/man/mansearchhelp.aux	3	MANSH=/usr/share/man-cgi-aux/mansearchhelp.aux
4		4
5	# Do we need lynxcgi URLs? For the moment our criterion is	5	# Do we need lynxcgi URLs? For the moment our criterion is
6	# 1) HTTP_USER_AGENT=Lynx* and 2) HTTP_HOST is unset.	6	# 1) HTTP_USER_AGENT=Lynx* and 2) HTTP_HOST is unset.

Return to bug 223667

Lines 56-62 Link Here

(-)man2html.orig/scripts/cgi-bin/man/mansearch (-3 / +3 lines)
56		56
57	BEGIN {	57	BEGIN {
58		58
59	searchdocument = "/home/httpd/cgi-aux/man/mansearch.aux";	59	searchdocument = "/usr/share/man-cgi-aux/mansearch.aux";
60	quote = ENVIRON["QUOTE"];	60	quote = ENVIRON["QUOTE"];
61	cgipath = ENVIRON["CG"];	61	cgipath = ENVIRON["CG"];
62	sedcmd = ENVIRON["SED"];	62	sedcmd = ENVIRON["SED"];
Lines 69-79 Link Here
69	}	69	}
70	# Have to be careful to single quote this	70	# Have to be careful to single quote this
71	# string later.	71	# string later.
72	gsub(/[^a-zA-Z0-9-_+ \t\/@%:;,$*\|]/, " ", string);	72	gsub(/[^a-zA-Z0-9\-_+ \t\/@%:;,$*\|]/, " ", string);
73		73
74	string = removeopts(string);	74	string = removeopts(string);
75		75
76	gsub(/[^a-zA-Z0-9-_+ \t\/@%:,]/, " ", options);	76	gsub(/[^a-zA-Z0-9\-_+ \t\/@%:,]/, " ", options);
77		77
78	if (!string) {	78	if (!string) {
79	if (system("test -r " searchdocument ) != 0) {	79	if (system("test -r " searchdocument ) != 0) {