Split fz_meta into separate querying functions.

Add fz_has_permission function to fz_document.
Add fz_lookup_metadata function to fz_document.
Remove fz_meta function from fz_document.

7 files changed, 89 insertions, 111 deletions

diff --git a/source/cbz/mucbz.c b/source/cbz/mucbz.c
index c85cca45..14be8333 100644
--- a/source/cbz/mucbz.c
+++ b/source/cbz/mucbz.c
@@ -187,16 +187,11 @@ cbz_load_page(fz_context *ctx, cbz_document *doc, int number)
 }
 
 static int
-cbz_meta(fz_context *ctx, cbz_document *doc, int key, void *ptr, int size)
+cbz_lookup_metadata(fz_context *ctx, cbz_document *doc, const char *key, char *buf, int size)
 {
-	switch (key)
-	{
-	case FZ_META_FORMAT_INFO:
-		sprintf((char *)ptr, "CBZ");
-		return FZ_META_OK;
-	default:
-		return FZ_META_UNKNOWN_KEY;
-	}
+	if (!strcmp(key, "format"))
+		return fz_strlcpy(buf, "CBZ", size);
+	return -1;
 }
 
 static cbz_document *
@@ -207,7 +202,7 @@ cbz_open_document_with_stream(fz_context *ctx, fz_stream *file)
 	doc->super.close = (fz_document_close_fn *)cbz_close_document;
 	doc->super.count_pages = (fz_document_count_pages_fn *)cbz_count_pages;
 	doc->super.load_page = (fz_document_load_page_fn *)cbz_load_page;
-	doc->super.meta = (fz_document_meta_fn *)cbz_meta;
+	doc->super.lookup_metadata = (fz_document_lookup_metadata_fn *)cbz_lookup_metadata;
 
 	fz_try(ctx)
 	{
diff --git a/source/cbz/muimg.c b/source/cbz/muimg.c
index 169fec95..ac6997ee 100644
--- a/source/cbz/muimg.c
+++ b/source/cbz/muimg.c
@@ -82,16 +82,11 @@ img_load_page(fz_context *ctx, img_document *doc, int number)
 }
 
 static int
-img_meta(fz_context *ctx, img_document *doc, int key, void *ptr, int size)
+img_lookup_metadata(fz_context *ctx, img_document *doc, const char *key, char *buf, int size)
 {
-	switch(key)
-	{
-	case FZ_META_FORMAT_INFO:
-		sprintf((char *)ptr, "IMAGE");
-		return FZ_META_OK;
-	default:
-		return FZ_META_UNKNOWN_KEY;
-	}
+	if (!strcmp(key, "format"))
+		return fz_strlcpy(buf, "Image", size);
+	return -1;
 }
 
 static img_document *
@@ -102,7 +97,7 @@ img_new_document(fz_context *ctx, fz_image *image)
 	doc->super.close = (fz_document_close_fn *)img_close_document;
 	doc->super.count_pages = (fz_document_count_pages_fn *)img_count_pages;
 	doc->super.load_page = (fz_document_load_page_fn *)img_load_page;
-	doc->super.meta = (fz_document_meta_fn *)img_meta;
+	doc->super.lookup_metadata = (fz_document_lookup_metadata_fn *)img_lookup_metadata;
 
 	doc->image = fz_keep_image(ctx, image);
 
diff --git a/source/cbz/mutiff.c b/source/cbz/mutiff.c
index 3a30cc79..3749fb11 100644
--- a/source/cbz/mutiff.c
+++ b/source/cbz/mutiff.c
@@ -100,16 +100,11 @@ tiff_count_pages(fz_context *ctx, tiff_document *doc)
 }
 
 static int
-tiff_meta(fz_context *ctx, tiff_document *doc, int key, void *ptr, int size)
+tiff_lookup_metadata(fz_context *ctx, tiff_document *doc, const char *key, char *buf, int size)
 {
-	switch (key)
-	{
-	case FZ_META_FORMAT_INFO:
-		sprintf((char *)ptr, "TIFF");
-		return FZ_META_OK;
-	default:
-		return FZ_META_UNKNOWN_KEY;
-	}
+	if (!strcmp(key, "format"))
+		return fz_strlcpy(buf, "TIFF", size);
+	return -1;
 }
 
 static void
@@ -129,7 +124,7 @@ tiff_open_document_with_stream(fz_context *ctx, fz_stream *file)
 	doc->super.close = (fz_document_close_fn *)tiff_close_document;
 	doc->super.count_pages = (fz_document_count_pages_fn *)tiff_count_pages;
 	doc->super.load_page = (fz_document_load_page_fn *)tiff_load_page;
-	doc->super.meta = (fz_document_meta_fn *)tiff_meta;
+	doc->super.lookup_metadata = (fz_document_lookup_metadata_fn *)tiff_lookup_metadata;
 
 	fz_try(ctx)
 	{
diff --git a/source/fitz/document.c b/source/fitz/document.c
index 232aa931..78bd707c 100644
--- a/source/fitz/document.c
+++ b/source/fitz/document.c
@@ -194,6 +194,14 @@ fz_authenticate_password(fz_context *ctx, fz_document *doc, const char *password
 	return 1;
 }
 
+int
+fz_has_permission(fz_context *ctx, fz_document *doc, fz_permission p)
+{
+	if (doc && doc->has_permission)
+		return doc->has_permission(ctx, doc, p);
+	return 1;
+}
+
 fz_outline *
 fz_load_outline(fz_context *ctx, fz_document *doc)
 {
@@ -222,11 +230,13 @@ fz_count_pages(fz_context *ctx, fz_document *doc)
 }
 
 int
-fz_meta(fz_context *ctx, fz_document *doc, int key, void *ptr, int size)
+fz_lookup_metadata(fz_context *ctx, fz_document *doc, const char *key, char *buf, int size)
 {
-	if (doc && doc->meta)
-		return doc->meta(ctx, doc, key, ptr, size);
-	return FZ_META_UNKNOWN_KEY;
+	if (buf && size > 0)
+		buf[0] = 0;
+	if (doc && doc->lookup_metadata)
+		return doc->lookup_metadata(ctx, doc, key, buf, size);
+	return -1;
 }
 
 void
diff --git a/source/pdf/pdf-crypt.c b/source/pdf/pdf-crypt.c
index 88e485ff..17419581 100644
--- a/source/pdf/pdf-crypt.c
+++ b/source/pdf/pdf-crypt.c
@@ -9,6 +9,19 @@ enum
 	PDF_CRYPT_UNKNOWN,
 };
 
+enum
+{
+	PDF_PERM_PRINT = 1 << 2,
+	PDF_PERM_CHANGE = 1 << 3,
+	PDF_PERM_COPY = 1 << 4,
+	PDF_PERM_NOTES = 1 << 5,
+	PDF_PERM_FILL_FORM = 1 << 8,
+	PDF_PERM_ACCESSIBILITY = 1 << 9,
+	PDF_PERM_ASSEMBLE = 1 << 10,
+	PDF_PERM_HIGH_RES_PRINT = 1 << 11,
+	PDF_DEFAULT_PERM_FLAGS = 0xfffc
+};
+
 typedef struct pdf_crypt_filter_s pdf_crypt_filter;
 
 struct pdf_crypt_filter_s
@@ -765,11 +778,18 @@ pdf_needs_password(fz_context *ctx, pdf_document *doc)
 }
 
 int
-pdf_has_permission(fz_context *ctx, pdf_document *doc, int p)
+pdf_has_permission(fz_context *ctx, pdf_document *doc, fz_permission p)
 {
 	if (!doc->crypt)
 		return 1;
-	return doc->crypt->p & p;
+	switch (p)
+	{
+	case FZ_PERMISSION_PRINT: return doc->crypt->p & PDF_PERM_PRINT;
+	case FZ_PERMISSION_COPY: return doc->crypt->p & PDF_PERM_COPY;
+	case FZ_PERMISSION_EDIT: return doc->crypt->p & PDF_PERM_CHANGE;
+	case FZ_PERMISSION_ANNOTATE: return doc->crypt->p & PDF_PERM_NOTES;
+	}
+	return 1;
 }
 
 unsigned char *
diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
index 91faac35..0ec3b6d4 100644
--- a/source/pdf/pdf-xref.c
+++ b/source/pdf/pdf-xref.c
@@ -2155,77 +2155,44 @@ pdf_update_stream(fz_context *ctx, pdf_document *doc, pdf_obj *obj, fz_buffer *n
 }
 
 int
-pdf_meta(fz_context *ctx, pdf_document *doc, int key, void *ptr, int size)
-{
-	switch (key)
-	{
-	/*
-		ptr: Pointer to block (uninitialised on entry)
-		size: Size of block (at least 64 bytes)
-		Returns: Document format as a brief text string.
-	*/
-	case FZ_META_FORMAT_INFO:
-		sprintf((char *)ptr, "PDF %d.%d", doc->version/10, doc->version % 10);
-		return FZ_META_OK;
-	case FZ_META_CRYPT_INFO:
+pdf_lookup_metadata(fz_context *ctx, pdf_document *doc, const char *key, char *buf, int size)
+{
+	if (!strcmp(key, "format"))
+		return fz_snprintf(buf, size, "PDF %d.%d", doc->version/10, doc->version % 10);
+
+	if (!strcmp(key, "encryption"))
+	{
 		if (doc->crypt)
-			sprintf((char *)ptr, "Standard V%d R%d %d-bit %s",
-				pdf_crypt_version(ctx, doc),
-				pdf_crypt_revision(ctx, doc),
-				pdf_crypt_length(ctx, doc),
-				pdf_crypt_method(ctx, doc));
+			return fz_snprintf(buf, size, "Standard V%d R%d %d-bit %s",
+					pdf_crypt_version(ctx, doc),
+					pdf_crypt_revision(ctx, doc),
+					pdf_crypt_length(ctx, doc),
+					pdf_crypt_method(ctx, doc));
 		else
-			sprintf((char *)ptr, "None");
-		return FZ_META_OK;
-	case FZ_META_HAS_PERMISSION:
-	{
-		int i;
-		switch (size)
-		{
-		case FZ_PERMISSION_PRINT:
-			i = PDF_PERM_PRINT;
-			break;
-		case FZ_PERMISSION_CHANGE:
-			i = PDF_PERM_CHANGE;
-			break;
-		case FZ_PERMISSION_COPY:
-			i = PDF_PERM_COPY;
-			break;
-		case FZ_PERMISSION_NOTES:
-			i = PDF_PERM_NOTES;
-			break;
-		default:
-			return 0;
-		}
-		return pdf_has_permission(ctx, doc, i);
+			return fz_strlcpy(buf, "None", size);
 	}
-	case FZ_META_INFO:
+
+	if (strstr(key, "info:") == key)
 	{
-		pdf_obj *info = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Info);
+		pdf_obj *info;
+		char *s;
+		int n;
+
+		info = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Info);
 		if (!info)
-		{
-			if (ptr)
-				*(char *)ptr = 0;
-			return 0;
-		}
-		info = pdf_dict_gets(ctx, info, *(char **)ptr);
+			return -1;
+
+		info = pdf_dict_gets(ctx, info, key + 5);
 		if (!info)
-		{
-			if (ptr)
-				*(char *)ptr = 0;
-			return 0;
-		}
-		if (info && ptr && size)
-		{
-			char *utf8 = pdf_to_utf8(ctx, doc, info);
-			fz_strlcpy(ptr, utf8, size);
-			fz_free(ctx, utf8);
-		}
-		return 1;
-	}
-	default:
-		return FZ_META_UNKNOWN_KEY;
+			return -1;
+
+		s = pdf_to_utf8(ctx, doc, info);
+		n = fz_strlcpy(buf, s, size);
+		fz_free(ctx, s);
+		return n;
 	}
+
+	return -1;
 }
 
 fz_transition *
@@ -2256,10 +2223,11 @@ pdf_new_document(fz_context *ctx, fz_stream *file)
 	doc->super.close = (fz_document_close_fn *)pdf_close_document;
 	doc->super.needs_password = (fz_document_needs_password_fn *)pdf_needs_password;
 	doc->super.authenticate_password = (fz_document_authenticate_password_fn *)pdf_authenticate_password;
+	doc->super.has_permission = (fz_document_has_permission_fn *)pdf_has_permission;
 	doc->super.load_outline = (fz_document_load_outline_fn *)pdf_load_outline;
 	doc->super.count_pages = (fz_document_count_pages_fn *)pdf_count_pages;
 	doc->super.load_page = (fz_document_load_page_fn *)pdf_load_page;
-	doc->super.meta = (fz_document_meta_fn *)pdf_meta;
+	doc->super.lookup_metadata = (fz_document_lookup_metadata_fn *)pdf_lookup_metadata;
 	doc->super.write = (fz_document_write_fn *)pdf_write_document;
 	doc->update_appearance = pdf_update_appearance;
 
diff --git a/source/xps/xps-zip.c b/source/xps/xps-zip.c
index 3759c4b6..0580378b 100644
--- a/source/xps/xps-zip.c
+++ b/source/xps/xps-zip.c
@@ -221,16 +221,11 @@ xps_close_document(fz_context *ctx, xps_document *doc)
 }
 
 static int
-xps_meta(fz_context *ctx, xps_document *doc, int key, void *ptr, int size)
+xps_lookup_metadata(fz_context *ctx, xps_document *doc, const char *key, char *buf, int size)
 {
-	switch (key)
-	{
-	case FZ_META_FORMAT_INFO:
-		sprintf((char *)ptr, "XPS");
-		return FZ_META_OK;
-	default:
-		return FZ_META_UNKNOWN_KEY;
-	}
+	if (!strcmp(key, "format"))
+		return fz_strlcpy(buf, "XPS", size);
+	return -1;
 }
 
 static void
@@ -241,5 +236,5 @@ xps_init_document(fz_context *ctx, xps_document *doc)
 	doc->super.load_outline = (fz_document_load_outline_fn *)xps_load_outline;
 	doc->super.count_pages = (fz_document_count_pages_fn *)xps_count_pages;
 	doc->super.load_page = (fz_document_load_page_fn *)xps_load_page;
-	doc->super.meta = (fz_document_meta_fn *)xps_meta;
+	doc->super.lookup_metadata = (fz_document_lookup_metadata_fn *)xps_lookup_metadata;
 }