X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fhttpd.c;h=4705e4426c0c17aa4711de79fd37af41d1b3dd7a;hp=c19dc2b35c487febf4b90788e4179918dad9326a;hb=9bdbffb8cc0d169349b5580b42602268e773b470;hpb=53d605e12c3765aeedabf2bfe0c5cc338dc95d5a diff --git a/src/server/httpd.c b/src/server/httpd.c index c19dc2b35c..4705e4426c 100644 --- a/src/server/httpd.c +++ b/src/server/httpd.c @@ -1,9 +1,7 @@ /*************************************************************************** - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007,2008,2009 Øyvind Harboe * * oyvind.harboe@zylin.com * * * - * Copyright (C) 2008 Free Software Foundation - * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -34,7 +32,7 @@ #include #include -#define PAGE_NOT_FOUND "File not foundFile not found" +#define PAGE_NOT_FOUND " File not found File not found" int loadFile(const char *name, void **data, size_t *len); @@ -71,7 +69,7 @@ static const char *httpd_exec_cgi_tcl_error(Jim_Interp *interp) t = appendf(t, "Runtime error, file \"%s\", line %d:
", interp->errorFileName, interp->errorLine); - t = appendf(t, " %s
", Jim_GetString(interp->result, NULL)); + t = appendf(t, " %s < br>", Jim_GetString(interp->result, NULL)); Jim_ListLength(interp, interp->stackTrace, &len); for (i = 0; i < len; i += 3) { @@ -84,7 +82,7 @@ static const char *httpd_exec_cgi_tcl_error(Jim_Interp *interp) file = Jim_GetString(objPtr, NULL); Jim_ListIndex(interp, interp->stackTrace, i + 2, &objPtr, JIM_NONE); line = Jim_GetString(objPtr, NULL); - t = appendf(t, "In procedure '%s' called at file \"%s\", line %s
", + t = appendf(t, "In procedure '%s' called at file \"%s\", line %s < br>", proc, file, line); } t = appendf(t, "\n"); @@ -111,7 +109,7 @@ static int httpd_Jim_Command_writeform(Jim_Interp *interp, int argc, const char *script = alloc_printf("set dummy_val $httppostdata(%s); set dummy_val", name); - retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__ ); + retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__); free((void *) script); if (retcode != JIM_OK) return retcode; @@ -152,7 +150,7 @@ httpd_Jim_Command_formfetch(Jim_Interp *interp, const char *script = alloc_printf("set dummy_val $httppostdata(%s); set dummy_val", name); - int retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__ ); + int retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__); free((void *) script); if (retcode != JIM_OK) { @@ -198,6 +196,7 @@ static void append_key(struct httpd_request *r, const char *key, const char *data, size_t off, size_t size) { Jim_Obj *keyObj = Jim_NewStringObj(interp, key, -1); + Jim_IncrRefCount(keyObj); Jim_Obj *value = NULL; Jim_Obj *dict = Jim_GetVariableStr(interp, "httppostdata", 0); @@ -208,16 +207,32 @@ static void append_key(struct httpd_request *r, const char *key, { value = NULL; } + else + { + Jim_IncrRefCount(value); + } } + if (value == NULL) + { value = Jim_NewStringObj(interp, "", -1); + Jim_IncrRefCount(value); + + } /* create a new object we append to and insert into this location */ Jim_Obj *newObj = Jim_NewStringObj(interp, "", -1); + Jim_IncrRefCount(newObj); Jim_AppendObj(interp, newObj, value); Jim_AppendString(interp, newObj, data, size); /* uhh... use name here of dictionary */ - Jim_SetDictKeysVector(interp, Jim_NewStringObj(interp, "httppostdata", -1), &keyObj, 1, newObj); + dict = Jim_NewStringObj(interp, "httppostdata", -1); + Jim_IncrRefCount(dict); + Jim_SetDictKeysVector(interp, dict, &keyObj, 1, newObj); + Jim_DecrRefCount(interp, dict); + Jim_DecrRefCount(interp, value); + Jim_DecrRefCount(interp, newObj); + Jim_DecrRefCount(interp, keyObj); } /* append data to each key */ @@ -257,7 +272,7 @@ int handle_request(struct MHD_Connection * connection, const char * url) const char *script = alloc_printf( "global httpdata; source {%s}; set httpdata", url); - retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__ ); + retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__); free((void *) script); if (retcode == JIM_ERR) @@ -402,7 +417,7 @@ static int ahc_echo(void * cls, struct MHD_Connection * connection, if (!*url) url="index.tcl"; - const char *file_name=alloc_printf("%s/%s", httpd_dir, url); + const char *file_name = alloc_printf("%s/%s", httpd_dir, url); int result = handle_request(connection, file_name); free((void *)file_name); return result; @@ -415,8 +430,8 @@ static pthread_mutex_t mutex; int httpd_start(void) { pthread_mutexattr_t attr; - pthread_mutexattr_init( &attr ); - pthread_mutex_init( &mutex, &attr ); + pthread_mutexattr_init(&attr); + pthread_mutex_init(&mutex, &attr); int port = 8888; LOG_USER("Launching httpd server on port %d", port); @@ -446,16 +461,16 @@ int httpd_start(void) void httpd_stop(void) { MHD_stop_daemon(d); - pthread_mutex_destroy( &mutex ); + pthread_mutex_destroy(&mutex); } void openocd_sleep_prelude(void) { - pthread_mutex_unlock( &mutex ); + pthread_mutex_unlock(&mutex); } void openocd_sleep_postlude(void) { - pthread_mutex_lock( &mutex ); + pthread_mutex_lock(&mutex); }