X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.c;h=3f95c53293eaf1be05e92fbb82c34660c43c2f1a;hb=8449480d29d2e03d9094ddce82557b251deb6567;hp=474b90e8f2adecdbf4a1a202c3ca9ba011fa6e08;hpb=b75bbfd9bd96ad8bb7174a768ae70cf3e8c5af7a;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index 474b90e8..3f95c532 100644
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.c
@@ -55,9 +55,9 @@ static const char token_cookie[] = "token";
 struct hreq_data {
 	struct hreq_data *next;
 	char *key;
-	int file;
 	size_t length;
 	char *value;
+	char *path;
 };
 
 static struct afb_arg req_get(struct afb_hreq *hreq, const char *name);
@@ -312,15 +312,24 @@ int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *f
 
 	/* serve directory */
 	if (S_ISDIR(st.st_mode)) {
-		if (hreq->url[hreq->lenurl - 1] != '/') {
-			/* the redirect is needed for reliability of relative path */
-			char *tourl = alloca(hreq->lenurl + 2);
-			memcpy(tourl, hreq->url, hreq->lenurl);
-			tourl[hreq->lenurl] = '/';
-			tourl[hreq->lenurl + 1] = 0;
-			rc = afb_hreq_redirect_to(hreq, tourl);
-		} else {
-			rc = afb_hreq_reply_file_if_exist(hreq, fd, "index.html");
+		static const char *indexes[] = { "index.html", NULL };
+		int i = 0;
+		rc = 0;
+		while (indexes[i] != NULL) {
+			if (faccessat(fd, indexes[i], R_OK, 0) == 0) {
+				if (hreq->url[hreq->lenurl - 1] != '/') {
+					/* the redirect is needed for reliability of relative path */
+					char *tourl = alloca(hreq->lenurl + 2);
+					memcpy(tourl, hreq->url, hreq->lenurl);
+					tourl[hreq->lenurl] = '/';
+					tourl[hreq->lenurl + 1] = 0;
+					rc = afb_hreq_redirect_to(hreq, tourl);
+				} else {
+					rc = afb_hreq_reply_file_if_exist(hreq, fd, indexes[i]);
+				}
+				break;
+			}
+			i++;
 		}
 		close(fd);
 		return rc;
@@ -371,7 +380,7 @@ int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *f
 	}
 
 	/* fills the value and send */
-	MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL, hreq->session->cacheTimeout);
+	MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL, hreq->cacheTimeout);
 	MHD_add_response_header(response, MHD_HTTP_HEADER_ETAG, etag);
 	MHD_queue_response(hreq->connection, status, response);
 	MHD_destroy_response(response);
@@ -415,23 +424,11 @@ const char *afb_hreq_get_header(struct afb_hreq *hreq, const char *name)
 	return MHD_lookup_connection_value(hreq->connection, MHD_HEADER_KIND, name);
 }
 
-void afb_hreq_post_end(struct afb_hreq *hreq)
-{
-	struct hreq_data *data = hreq->data;
-	while(data) {
-		if (data->file > 0) {
-			close(data->file);
-			data->file = -1;
-		}
-		data = data->next;
-	}
-}
-
 int afb_hreq_post_add(struct afb_hreq *hreq, const char *key, const char *data, size_t size)
 {
 	void *p;
 	struct hreq_data *hdat = get_data(hreq, key, 1);
-	if (hdat->file) {
+	if (hdat->path != NULL) {
 		return 0;
 	}
 	p = realloc(hdat->value, hdat->length + size + 1);
@@ -445,38 +442,55 @@ int afb_hreq_post_add(struct afb_hreq *hreq, const char *key, const char *data,
 	return 1;
 }
 
+static int opentempfile(char **path)
+{
+	int fd;
+	char *fname;
+
+	fname = strdup("XXXXXX"); /* TODO improve the path */
+	if (fname == NULL)
+		return -1;
+
+	fd = mkostemp(fname, O_CLOEXEC|O_WRONLY);
+	if (fd < 0)
+		free(fname);
+	else
+		*path = fname;
+	return fd;
+}
+
 int afb_hreq_post_add_file(struct afb_hreq *hreq, const char *key, const char *file, const char *data, size_t size)
 {
+	int fd;
+	ssize_t sz;
 	struct hreq_data *hdat = get_data(hreq, key, 1);
 
-	/* continuation with reopening */
-	if (hdat->file < 0) {
-		hdat->file = open(hdat->value, O_WRONLY|O_APPEND);
-		if (hdat->file == 0) {
-			hdat->file = dup(0);
-			close(0);
-		}
-		if (hdat->file <= 0)
+fprintf(stderr, "%s=%s %s=%s %s\n",key,hdat->key,file,hdat->value,hdat->path);
+	if (hdat->value == NULL) {
+		hdat->value = strdup(file);
+		if (hdat->value == NULL)
 			return 0;
+		fd = opentempfile(&hdat->path);
+	} else if (strcmp(hdat->value, file) || hdat->path == NULL) {
+		return 0;
+	} else {
+		fd = open(hdat->path, O_WRONLY|O_APPEND);
 	}
-	if (hdat->file > 0) {
-		write(hdat->file, data, size);
-		return 1;
+	if (fd < 0)
+		return 0;
+	while (size) {
+		sz = write(fd, data, size);
+		if (sz >= 0) {
+			hdat->length += (size_t)sz;
+			size -= (size_t)sz;
+			data += sz;
+		} else if (errno != EINTR)
+			break;
 	}
-
-	/* creation */
-	/* TODO */
-	return 0;
-	
+	close(fd);
+	return !size;
 }
 
-int afb_hreq_is_argument_a_file(struct afb_hreq *hreq, const char *key)
-{
-	struct hreq_data *hdat = get_data(hreq, key, 0);
-	return hdat != NULL && hdat->file != 0;
-}
-
-
 struct afb_req afb_hreq_to_req(struct afb_hreq *hreq)
 {
 	return (struct afb_req){ .itf = &afb_hreq_itf, .data = hreq };
@@ -490,14 +504,14 @@ static struct afb_arg req_get(struct afb_hreq *hreq, const char *name)
 			.name = hdat->key,
 			.value = hdat->value,
 			.size = hdat->length,
-			.is_file = (hdat->file != 0)
+			.path = hdat->path
 		};
 		
 	return (struct afb_arg){
 		.name = name,
 		.value = MHD_lookup_connection_value(hreq->connection, MHD_GET_ARGUMENT_KIND, name),
 		.size = 0,
-		.is_file = 0
+		.path = NULL
 	};
 }
 
@@ -514,9 +528,9 @@ static int _iterargs_(struct iterdata *id, enum MHD_ValueKind kind, const char *
 		return 1;
 	return id->iterator(id->closure, (struct afb_arg){
 		.name = key,
-		.value = value,
-		.size = 0,
-		.is_file = 0
+		.value = value ? : "",
+		.size = value ? strlen(value) : 0,
+		.path = NULL
 	});
 }
 
@@ -529,7 +543,7 @@ static void req_iterate(struct afb_hreq *hreq, int (*iterator)(void *closure, st
 			.name = hdat->key,
 			.value = hdat->value,
 			.size = hdat->length,
-			.is_file = (hdat->file != 0)}))
+			.path = hdat->path}))
 			return;
 		hdat = hdat->next;
 	}