%s

X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/4b8483ae278577a3adc8d84da81d77019704466f..8d14d66b84cc370cefe54b33de1b95bb49c90bf6:/getcgi.c diff --git a/getcgi.c b/getcgi.c index 47a94b2..b15351c 100644 --- a/getcgi.c +++ b/getcgi.c @@ -9,6 +9,7 @@ #include #include +#include #include #include "getcgi.h" @@ -25,7 +26,7 @@ char *txt2html(const char *string) char *ptr = NULL; char *nextptr = NULL; - buf[0] = 0; + memset(buf, 0, 1024); ptr = strchr(string, '<'); if (ptr != NULL) { @@ -57,8 +58,42 @@ char *txt2html(const char *string) return buf; } +/* + * start_html - Start HTML output. + * @title: The title for the HTML. + * + * Takes a title string and starts HTML output, including the + * Content-Type header all the way up to . + */ +void start_html(const char *title) +{ + puts("Content-Type: text/html; charset=UTF-8\n"); + puts(""); + puts(""); + puts(""); + printf("%s\n", title); + puts(""); + puts(""); + + return; +} + +/* + * end_html - End HTML output. + * + * Ends HTML output - closes the BODY and HTML tags. + */ +void end_html(void) +{ + puts(""); + puts(""); + + return; +} + + /* Convert a two-char hex string into the char it represents */ -char x2c(char *what) +char x2c(const char *what) { register char digit; @@ -94,25 +129,26 @@ char **getcgivars(int argc, char *argv[]) int i; char *request_method; int content_length, paircount; - char *cgiinput; - char **cgivars; - char **pairlist; + char *cgiinput = NULL; + char **cgivars = NULL; + char **pairlist = NULL; char *nvpair,*eqpos; /* Depending on the request method, read all CGI input into cgiinput */ /* (really should produce HTML error messages, instead of exit()ing) */ - request_method=getenv("REQUEST_METHOD"); + request_method = getenv("REQUEST_METHOD"); if (request_method == NULL) { if (argc > 1) { - cgiinput = argv[1]; + cgiinput = strdup(argv[1]); } else { return NULL; } } else if (strlen(request_method)==0) { return NULL; - } else if (!strcmp(request_method, "GET") || !strcmp(request_method, "HEAD")) { + } else if (!strcmp(request_method, "GET") || + !strcmp(request_method, "HEAD")) { cgiinput=strdup(getenv("QUERY_STRING")); } else if (!strcmp(request_method, "POST")) { if (getenv("CONTENT_TYPE") != NULL && @@ -123,12 +159,14 @@ char **getcgivars(int argc, char *argv[]) } if (!(content_length = atoi(getenv("CONTENT_LENGTH")))) { - printf("getcgivars(): No Content-Length was sent with the POST request.\n"); + printf("getcgivars(): No Content-Length was sent with" + " the POST request.\n"); exit(1); } if (!(cgiinput= (char *) malloc(content_length+1))) { - printf("getcgivars(): Could not malloc for cgiinput.\n"); + printf("getcgivars(): Could not malloc for " + "cgiinput.\n"); exit(1); } @@ -154,7 +192,10 @@ char **getcgivars(int argc, char *argv[]) nvpair=strtok(cgiinput, "&"); while (nvpair) { pairlist[paircount++]= strdup(nvpair) ; - if (!(paircount%256)) pairlist=(char **) realloc(pairlist,(paircount+256)*sizeof(char **)); + if (!(paircount%256)) { + pairlist=(char **) realloc(pairlist, + (paircount+256)*sizeof(char **)); + } nvpair=strtok(NULL, "&") ; } @@ -184,3 +225,27 @@ char **getcgivars(int argc, char *argv[]) /* Return the list of name-value strings */ return cgivars; } + + +/** + * cleanupcgi - free the memory allocated for our CGI parameters. + * @cgivars: The CGI parameter list to free. + * + * Frees up the elements of the CGI parameter array and then frees the + * array. + */ +void cleanupcgi(char **cgivars) +{ + int i; + + if (cgivars != NULL) { + for (i = 0; cgivars[i] != NULL; i++) { + free(cgivars[i]); + cgivars[i] = NULL; + } + free(cgivars); + cgivars = NULL; + } + + return; +}