Unverified Commit 218f4d98 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14301 Revert "unicode: Don't special case ignorable code points" 

Merge Pull Request from: @ci-robot 
 
PR sync from: Cheng Yu <serein.chengyu@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/NVYFIF3NUCOEUP6FSJBO63ZCRZJBKPHJ/ 
 
https://gitee.com/openeuler/kernel/issues/IBD0BE 
 
Link:https://gitee.com/openeuler/kernel/pulls/14301

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents b6753fb2 045a53b5

fs/unicode/mkutf8data.c

+70 −0
Original line number Diff line number Diff line
@@ -2230,6 +2230,75 @@ static void nfdicf_init(void) 
		file_fail(fold_name);

}



static void ignore_init(void)

{

	FILE *file;

	unsigned int unichar;

	unsigned int first;

	unsigned int last;

	unsigned int *um;

	int count;

	int ret;



	if (verbose > 0)

		printf("Parsing %s\n", prop_name);

	file = fopen(prop_name, "r");

	if (!file)

		open_fail(prop_name, errno);

	assert(file);

	count = 0;

	while (fgets(line, LINESIZE, file)) {

		ret = sscanf(line, "%X..%X ; %s # ", &first, &last, buf0);

		if (ret == 3) {

			if (strcmp(buf0, "Default_Ignorable_Code_Point"))

				continue;

			if (!utf32valid(first) || !utf32valid(last))

				line_fail(prop_name, line);

			for (unichar = first; unichar <= last; unichar++) {

				free(unicode_data[unichar].utf32nfdi);

				um = malloc(sizeof(unsigned int));

				*um = 0;

				unicode_data[unichar].utf32nfdi = um;

				free(unicode_data[unichar].utf32nfdicf);

				um = malloc(sizeof(unsigned int));

				*um = 0;

				unicode_data[unichar].utf32nfdicf = um;

				count++;

			}

			if (verbose > 1)

				printf(" %X..%X Default_Ignorable_Code_Point\n",

					first, last);

			continue;

		}

		ret = sscanf(line, "%X ; %s # ", &unichar, buf0);

		if (ret == 2) {

			if (strcmp(buf0, "Default_Ignorable_Code_Point"))

				continue;

			if (!utf32valid(unichar))

				line_fail(prop_name, line);

			free(unicode_data[unichar].utf32nfdi);

			um = malloc(sizeof(unsigned int));

			*um = 0;

			unicode_data[unichar].utf32nfdi = um;

			free(unicode_data[unichar].utf32nfdicf);

			um = malloc(sizeof(unsigned int));

			*um = 0;

			unicode_data[unichar].utf32nfdicf = um;

			if (verbose > 1)

				printf(" %X Default_Ignorable_Code_Point\n",

					unichar);

			count++;

			continue;

		}

	}

	fclose(file);



	if (verbose > 0)

		printf("Found %d entries\n", count);

	if (count == 0)

		file_fail(prop_name);

}



static void corrections_init(void)

{

	FILE *file;
@@ -3341,6 +3410,7 @@ int main(int argc, char *argv[]) 
	ccc_init();

	nfdi_init();

	nfdicf_init();

	ignore_init();

	corrections_init();

	hangul_decompose();

	nfdi_decompose();

fs/unicode/utf8data.c_shipped

+3357 −3346

File changed.

Preview size limit exceeded, changes collapsed.