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);
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);
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 };
.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
};
}
.name = key,
.value = value,
.size = 0,
- .is_file = 0
+ .path = NULL
});
}
.name = hdat->key,
.value = hdat->value,
.size = hdat->length,
- .is_file = (hdat->file != 0)}))
+ .path = hdat->path}))
return;
hdat = hdat->next;
}