#include "config.h"
#endif
-#include "replacements.h"
-
-#include "server.h"
-
-#include "log.h"
#include "telnet_server.h"
#include "target.h"
-#include <command.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <signal.h>
-
-#include <sys/types.h>
-#include <sys/select.h>
-#include <sys/socket.h>
#include <microhttpd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <pthread.h>
+#include <signal.h>
#define PAGE_NOT_FOUND "<html><head><title>File not found</title></head><body>File not found</body></html>"
+int loadFile(const char *name, void **data, size_t *len);
+
static const char *appendf(const char *prev, const char *format, ...)
{
va_list ap;
data = Jim_GetString(Jim_GetResult(interp), &actual);
- FILE *f;
- f = fopen(file, "wb");
- if (f != NULL)
+ FILE *f = fopen(file, "wb");
+ if (NULL == f)
{
- int ok;
- ok = fwrite(data, 1, actual, f) == actual;
- fclose(f);
-
- if (!ok)
- {
- Jim_SetResultString(interp, "Could not write to file", -1);
- return JIM_ERR;
- }
+ Jim_SetResultString(interp, "Could not create file", -1);
+ return JIM_ERR;
}
- else
+
+ int result = fwrite(data, 1, actual, f);
+ fclose(f);
+
+ if (result != actual)
{
- Jim_SetResultString(interp, "Could not create file", -1);
+ Jim_SetResultString(interp, "Could not write to file", -1);
return JIM_ERR;
}
return JIM_OK;
/* append data to each key */
static int iterate_post(void *con_cls, enum MHD_ValueKind kind,
const char *key, const char *filename, const char *content_type,
- const char *transfer_encoding, const char *data, size_t off,
+ const char *transfer_encoding, const char *data, uint64_t off,
size_t size)
{
struct httpd_request *r = (struct httpd_request*) con_cls;
}
else
{
- printf("Tcl OK\n");
+ LOG_DEBUG("Tcl OK");
/* FIX!!! how to handle mime types??? */
const char *result;
int reslen;
else
{
void *data;
- int len;
+ size_t len;
int retval = loadFile(url, &data, &len);
if (retval != ERROR_OK)
return ret;
}
- LOG_DEBUG("Serving %s length=%d", 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");
if (r->post)
{
r->postprocessor = MHD_create_post_processor(connection, 2048
- * 1024, iterate_post, r);
+ * 1024, &iterate_post, r);
}
return MHD_YES;
* being subverted to evil purposes
*/
- const char *httpd_dir=PKGLIBDIR "/httpd";
+ const char *httpd_dir = PKGDATADIR "/httpd";
if (*url=='/')
{
}
static struct MHD_Daemon * d;
+static pthread_mutex_t mutex;
+
int httpd_start(void)
{
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_init( &attr );
+ pthread_mutex_init( &mutex, &attr );
int port = 8888;
LOG_USER("Launching httpd server on port %d", port);
void httpd_stop(void)
{
MHD_stop_daemon(d);
+ pthread_mutex_destroy( &mutex );
}
void openocd_sleep_prelude(void)
{
- /* FIX!!!! add locking here!!!! */
+ pthread_mutex_unlock( &mutex );
}
void openocd_sleep_postlude(void)
{
- /* FIX!!!! add locking here!!!! */
+ pthread_mutex_lock( &mutex );
}