diff --git a/mozilla/webtools/web-sniffer/cgiview.c b/mozilla/webtools/web-sniffer/cgiview.c
index a6af558907a..4ec2c062323 100644
--- a/mozilla/webtools/web-sniffer/cgiview.c
+++ b/mozilla/webtools/web-sniffer/cgiview.c
@@ -76,12 +76,13 @@ cgiviewHTMLAttributeValue(App *app, HTML *html, Buf *buf)
fprintf(view->out, "&referer=%s\">", referer);
free(referer);
urlFree(url);
- }
- viewHTMLAttributeValue(app, buf);
- if (html->currentAttributeIsURL)
- {
+ viewHTMLText(app, buf);
fprintf(view->out, "");
}
+ else
+ {
+ viewHTMLAttributeValue(app, buf);
+ }
}
static void
@@ -157,12 +158,13 @@ cgiviewHTTPResponseHeaderValue(App *app, Buf *buf, unsigned char *url)
urlstring = escapeHTML(url);
fprintf(view->out, "", me, urlstring);
free(urlstring);
- }
- viewHTTPHeaderValue(app, buf);
- if (url)
- {
+ viewHTTP(app, buf);
fprintf(view->out, "");
}
+ else
+ {
+ viewHTTPHeaderValue(app, buf);
+ }
}
static HTTPNameValue *
@@ -383,9 +385,9 @@ main(int argc, char *argv[])
}
if (url && (*url))
{
- fprintf(view->out,
- "View %s\n",
- url);
+ fprintf(view->out, "View %s", url);
+ fprintf(view->out, "");
+ fprintf(view->out, "\n");
viewReport(app, "input url:");
viewReport(app, (char *) url);
viewReportHTML(app, "
");
diff --git a/mozilla/webtools/web-sniffer/view.c b/mozilla/webtools/web-sniffer/view.c
index 2e1568c6f22..522022b48c7 100644
--- a/mozilla/webtools/web-sniffer/view.c
+++ b/mozilla/webtools/web-sniffer/view.c
@@ -24,9 +24,9 @@
#include "all.h"
-#define CONTROL_START ""
+#define CONTROL_START ""
#define CONTROL(str) CONTROL_START str CONTROL_END
-#define CONTROL_END ""
+#define CONTROL_END ""
#define NL "\n"
static int verbose = 0;
@@ -156,49 +156,49 @@ print(View *view, Buf *b)
void
viewHTML(App *app, Buf *buf)
{
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
print(&app->view, buf);
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
}
void
viewHTMLAttributeName(App *app, Buf *buf)
{
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
print(&app->view, buf);
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
}
void
viewHTMLAttributeValue(App *app, Buf *buf)
{
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
print(&app->view, buf);
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
}
void
viewHTMLDeclaration(App *app, Buf *buf)
{
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
print(&app->view, buf);
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
}
void
viewHTMLProcessingInstruction(App *app, Buf *buf)
{
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
print(&app->view, buf);
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
}
void
viewHTMLTag(App *app, Buf *buf)
{
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
print(&app->view, buf);
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
}
void
@@ -216,17 +216,17 @@ viewHTTP(App *app, Buf *buf)
void
viewHTTPHeaderName(App *app, Buf *buf)
{
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
print(&app->view, buf);
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
}
void
viewHTTPHeaderValue(App *app, Buf *buf)
{
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
print(&app->view, buf);
- fprintf(app->view.out, "");
+ fprintf(app->view.out, "");
}
void