File not found

X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2Fhttpd.c;h=2662600837c7c04b596dd1188ddb462d89f2c62d;hb=d68096dcf2c356eadf0c89d22866c1756128a24d;hp=8ab5cb8feddff437b0febb164d6c70f5430849f2;hpb=dd86b54e6e03a0682eb8ed41006ffdfd837ffae0;p=openocd.git diff --git a/src/server/httpd.c b/src/server/httpd.c index 8ab5cb8fed..2662600837 100644 --- a/src/server/httpd.c +++ b/src/server/httpd.c @@ -34,7 +34,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 +71,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 +84,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 +111,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; @@ -142,7 +142,7 @@ httpd_Jim_Command_formfetch(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { - if (argc!=2) + if (argc != 2) { Jim_WrongNumArgs(interp, 1, argv, "method ?args ...?"); return JIM_ERR; @@ -152,7 +152,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) { @@ -202,7 +202,7 @@ static void append_key(struct httpd_request *r, const char *key, Jim_Obj *dict = Jim_GetVariableStr(interp, "httppostdata", 0); - if (dict!=NULL) + if (dict != NULL) { if (Jim_DictKey(interp, dict, keyObj, &value, 0) != JIM_OK) { @@ -257,7 +257,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) @@ -307,7 +307,7 @@ int handle_request(struct MHD_Connection * connection, const char * url) return ret; } - LOG_DEBUG("Serving %s length=%u", url, len); + LOG_DEBUG("Serving %s length=%zu", url, len); /* serve file directly */ response = MHD_create_response_from_data(len, data, MHD_YES, MHD_NO); MHD_add_response_header(response, "Content-Type", "image/png"); @@ -402,7 +402,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 +415,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 +446,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); }