X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fafb-hreq.c;h=93cce62b67dc21b9ba9da0afd18e60fc0f532ae2;hb=3d28e7d00cd8641bf600d47ed0e3e7e57cb5b439;hp=045a0d60d949839f3ea4f66d7dee4f251dca1d71;hpb=37d39868e7eed7ff3c8420dec0e3e82caa7cd868;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index 045a0d60..93cce62b 100644
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.c
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#define USE_MAGIC_MIME_TYPE
 #define _GNU_SOURCE
 
 #include <stdlib.h>
@@ -53,6 +52,7 @@ static const char token_cookie[] = "token";
 
 static char *cookie_name = NULL;
 static char *cookie_setter = NULL;
+static char *tmp_pattern = NULL;
 
 struct hreq_data {
 	struct hreq_data *next;
@@ -145,12 +145,6 @@ static int validsubpath(const char *subpath)
 	return 1;
 }
 
-#if defined(USE_MAGIC_MIME_TYPE)
-
-#if !defined(MAGIC_DB)
-#define MAGIC_DB "/usr/share/misc/magic.mgc"
-#endif
-
 static void afb_hreq_reply_v(struct afb_hreq *hreq, unsigned status, struct MHD_Response *response, va_list args)
 {
 	char *cookie;
@@ -209,6 +203,12 @@ void afb_hreq_reply_free(struct afb_hreq *hreq, unsigned status, size_t size, ch
 	va_end(args);
 }
 
+#if defined(USE_MAGIC_MIME_TYPE)
+
+#if !defined(MAGIC_DB)
+#define MAGIC_DB "/usr/share/misc/magic.mgc"
+#endif
+
 static magic_t lazy_libmagic()
 {
 	static int done = 0;
@@ -254,8 +254,9 @@ static const char *mimetype_fd_name(int fd, const char *filename)
 	const char *extension = strrchr(filename, '.');
 	if (extension) {
 		static const char *const known[][2] = {
-			{ ".js", "text/javascript" },
+			{ ".js",   "text/javascript" },
 			{ ".html", "text/html" },
+			{ ".css",  "text/css" },
 			{ NULL, NULL }
 		};
 		int i = 0;
@@ -492,12 +493,53 @@ int afb_hreq_post_add(struct afb_hreq *hreq, const char *key, const char *data,
 	return 1;
 }
 
+int afb_hreq_init_download_path(const char *directory)
+{
+	struct stat st;
+	size_t n;
+	char *p;
+
+	if (access(directory, R_OK|W_OK)) {
+		/* no read/write access */
+		return -1;
+	}
+	if (stat(directory, &st)) {
+		/* can't get info */
+		return -1;
+	}
+	if (!S_ISDIR(st.st_mode)) {
+		/* not a directory */
+		errno = ENOTDIR;
+		return -1;
+	}
+	n = strlen(directory);
+	while(n > 1 && directory[n-1] == '/') n--;
+	p = malloc(n + 8);
+	if (p == NULL) {
+		/* can't allocate memory */
+		errno = ENOMEM;
+		return -1;
+	}
+	memcpy(p, directory, n);
+	p[n++] = '/';
+	p[n++] = 'X';
+	p[n++] = 'X';
+	p[n++] = 'X';
+	p[n++] = 'X';
+	p[n++] = 'X';
+	p[n++] = 'X';
+	p[n] = 0;
+	free(tmp_pattern);
+	tmp_pattern = p;
+	return 0;
+}
+
 static int opentempfile(char **path)
 {
 	int fd;
 	char *fname;
 
-	fname = strdup("XXXXXX"); /* TODO improve the path */
+	fname = strdup(tmp_pattern ? : "XXXXXX"); /* TODO improve the path */
 	if (fname == NULL)
 		return -1;