4d0515666d53ed314b503f52a80cfb5a3744af28 kent Mon Oct 31 12:54:32 2016 -0700 Fixing so that you can run htmlCheck on local files rather than just URLS. diff --git src/utils/htmlCheck/htmlCheck.c src/utils/htmlCheck/htmlCheck.c index 50cf9b1..f098479 100644 --- src/utils/htmlCheck/htmlCheck.c +++ src/utils/htmlCheck/htmlCheck.c @@ -311,43 +311,51 @@ AllocVar(cookie); cookie->name = cloneString(word); cookie->value = cloneString(line); slAddHead(&list, cookie); } lineFileClose(&lf); slReverse(&list); return list; } void htmlCheck(char *command, char *url, char *cookieFile) /* Read url. Switch on command and dispatch to appropriate routine. */ { char *fullText; struct htmlCookie *cookies = NULL; +boolean isLocal = (stringIn("://", url) == NULL); if (cookieFile != NULL) cookies = readCookies(cookieFile); +if (isLocal) + readInGulp(url, &fullText, NULL); +else fullText = htmlSlurpWithCookies(url, cookies); if (sameString(command, "getAll")) mustWrite(stdout, fullText, strlen(fullText)); else if (sameString(command, "ok")) checkOk(fullText); else if (sameString(command, "getHeader")) getHeader(fullText); else /* Do everything that requires full parsing. */ { - struct htmlPage *page = htmlPageParseOk(url, fullText); + struct htmlPage *page = NULL; + if (isLocal) + page = htmlPageParseNoHead(url, fullText); + else + page = htmlPageParseOk(url, fullText); if (sameString(command, "getHtml")) fputs(page->htmlText, stdout); else if (sameString(command, "getLinks")) getLinks(page); else if (sameString(command, "getForms")) htmlPrintForms(page, stdout); else if (sameString(command, "getVars")) getVars(page); else if (sameString(command, "getTags")) getTags(page); else if (sameString(command, "getCookies")) getCookies(page); else if (sameString(command, "submit")) quickSubmit(page); else if (sameString(command, "validate"))