cscvs to tla changeset 93

[onak.git] / getcgi.c

diff --git a/getcgi.c b/getcgi.c
index aa254f84c4bab995c856f870a6b703d939491d16..ac37cff339d64e523c3b5a5f2db1bcd432aea051 100644 (file)
--- a/getcgi.c
+++ b/getcgi.c
@@ -5,6 +5,8 @@
  *
  * The x2c() and unescape_url() routines were lifted directly
  * from NCSA's sample program util.c, packaged with their HTTPD.
+ *
+ * $Id: getcgi.c,v 1.5 2003/06/04 20:57:07 noodles Exp $
  */
 
 #include <stdio.h>
@@ -128,25 +130,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 &&
@@ -157,12 +160,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);
                }
                
@@ -188,7 +193,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, "&") ;
        }
 
@@ -218,3 +226,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;
+}