laumann/ani - Change ZS3UJEZU4PZEYOXQNZWZGDNXTP5ESNPRAEHPJQ24O3TWZH746IBQC

change: support version = 4 (noenc) format

Supporting the noenc format requires (1) decoding authors slightly differently and (2) not attempting to read an encoding field for most hunks. The default encoding in such instances is UTF-8.

Created by laumann on October 6, 2023

ZS3UJEZU4PZEYOXQNZWZGDNXTP5ESNPRAEHPJQ24O3TWZH746IBQC

Dependencies

In channels

main

In discussions

#6 Support VERSION_NOENC (4) change author format

Change contents

Insertion in change.c at line 289 [5.1047]

[4.3757]

static void
change_decode_encoding_noenc(struct bincode *bc, char **encoding)
{
	(void)bc;
	*encoding = xstrdup("UTF-8");
}

Insertion in change.c at line 304 [5.1047]

[6.489]

[4.3878]

	void (*fn_change_decode_encoding)(struct bincode *, char **);
	fn_change_decode_encoding = &change_decode_encoding;
	if (hashed->version == VERSION_NOENC)
		fn_change_decode_encoding = change_decode_encoding_noenc;

Replacement in change.c at line 324 [5.1047]

B:BD[7.3181] → [7.3181:3235]

			change_decode_encoding(bc, &bhunk->edit.encoding);

[7.3181]

[4.4305]

			fn_change_decode_encoding(bc, &bhunk->edit.encoding);

Replacement in change.c at line 330 [5.1047]

B:BD[7.3406] → [7.3406:3467]

			change_decode_encoding(bc, &bhunk->replacement.encoding);

[7.3406]

[8.0]

			fn_change_decode_encoding(
				bc, &bhunk->replacement.encoding
			);

Replacement in change.c at line 342 [5.1047]

∅:D[3.238] → [7.3734:3791]

B:BD[7.3734] → [7.3734:3791]

			change_decode_encoding(bc, &bhunk->fileadd.encoding);

[3.238]

[9.583]

			fn_change_decode_encoding(bc, &bhunk->fileadd.encoding);

Replacement in change.c at line 359 [5.1047]

∅:D[3.430] → [7.4185:4242]

B:BD[7.4185] → [7.4185:4242]

			change_decode_encoding(bc, &bhunk->filedel.encoding);

[3.430]

[10.58]

			fn_change_decode_encoding(bc, &bhunk->filedel.encoding);

Replacement in change.c at line 370 [5.1047]

∅:D[3.529] → [7.4442:4501]

B:BD[7.4442] → [7.4442:4501]

			change_decode_encoding(bc, &bhunk->fileundel.encoding);

[3.529]

[11.258]

			fn_change_decode_encoding(
				bc, &bhunk->fileundel.encoding
			);

Replacement in change.c at line 407 [5.1047]
∅:D[7.5040] → [12.490:517]
B:BD[12.490] → [12.490:517]
```
			change_decode_encoding(
```
[7.5040]
[7.5041]
```
			fn_change_decode_encoding(
```

Insertion in change.c at line 423 [5.1047]

[9.620]

	}
}
void
change_decode_author(struct bincode *bc, struct author *author)
{
	size_t len, i;
	len = bincode_getu64(bc);
	author->len = len;
	author->entries = xmalloc(sizeof(struct authorentry) * len);
	for (i = 0; i < author->len; i++) {
		len = bincode_getu64(bc);
		author->entries[i].key = xmalloc(len + 1);
		bincode_getstr(bc, author->entries[i].key, len);
		len = bincode_getu64(bc);
		author->entries[i].value = xmalloc(len + 1);
		bincode_getstr(bc, author->entries[i].value, len);
	}
}
void
change_decode_author_noenc(struct bincode *bc, struct author *author)
{
	size_t len, i;
	char *name, *full_name, *email;
	i = 1;
	full_name = email = NULL;
	len = bincode_getu64(bc);
	name = xmalloc(len + 1);
	bincode_getstr(bc, name, len);
	if (bincode_getu8(bc)) {
		i++;
		len = bincode_getu64(bc);
		full_name = xmalloc(len + 1);
		bincode_getstr(bc, full_name, len);
	}
	if (bincode_getu8(bc)) {
		i++;
		len = bincode_getu64(bc);
		email = xmalloc(len + 1);
		bincode_getstr(bc, email, len);
	}
	author->len = i;
	author->entries = xmalloc(sizeof(struct authorentry) * i);
	i = 0;
	author->entries[i].key = xstrdup("name");
	author->entries[i].value = name;
	if (full_name) {
		i++;
		author->entries[i].key = xstrdup("full_name");
		author->entries[i].value = full_name;

Insertion in change.c at line 486 [5.1047]

[9.623]

	if (email) {
		i++;
		author->entries[i].key = xstrdup("email");
		author->entries[i].value = email;
	}

Insertion in change.c at line 508 [5.1047]

[7.5304]

[13.2591]

	void (*fn_change_decode_author)(struct bincode *, struct author *);

Replacement in change.c at line 566 [5.1047]

B:BD[14.514] → [15.427:479]

B:BD[15.479] → [6.490:502]

B:BD[6.502] → [7.5718:5747]

∅:D[7.5747] → [15.480:522]

B:BD[14.634] → [15.480:522]

B:BD[15.522] → [16.3897:3938]

∅:D[17.3169] → [15.523:626]

∅:D[16.3938] → [15.523:626]

B:BD[18.1331] → [15.523:626]

B:BD[15.626] → [19.43:176]

	for (i = 0; i < hashed->header.authors.len; i++) {
		size_t j;
		len = bincode_getu64(&bc);
		hashed->header.authors.map[i].entries =
			xmalloc(sizeof(struct author) * len);
		hashed->header.authors.map[i].len = len;
		for (j = 0; j < hashed->header.authors.map[i].len; j++) {
			// In VERSION_NOENC, the authors are a struct { name: str, full_name: maybe str, email: maybe str } instead of a more generic map

[14.514]

[19.176]

	fn_change_decode_author = change_decode_author;
	if (hashed->version == VERSION_NOENC)
		fn_change_decode_author = change_decode_author_noenc;

Replacement in change.c at line 570 [5.1047]

B:BD[19.177] → [19.177:265]

B:BD[19.265] → [7.5748:5778]

∅:D[7.5778] → [15.627:677]

B:BD[14.849] → [15.627:677]

B:BD[15.677] → [3.1075:1189]

∅:D[3.1189] → [7.5809:5839]

B:BD[7.5809] → [7.5809:5839]

∅:D[7.5839] → [15.678:730]

B:BD[14.964] → [15.678:730]

B:BD[15.730] → [3.1190:1306]

∅:D[3.1306] → [14.1172:1176]

∅:D[18.1617] → [14.1172:1176]

∅:D[7.5870] → [14.1172:1176]

B:BD[14.1172] → [14.1172:1176]

			// TODO switch on offsets.version to figure
			// out how to decode the authors here
			len = bincode_getu64(&bc);
			hashed->header.authors.map[i].entries[j].key =
				xmalloc(len + 1);
			bincode_getstr(
				&bc,
				hashed->header.authors.map[i].entries[j].key,
				len
			);
			len = bincode_getu64(&bc);
			hashed->header.authors.map[i].entries[j].value =
				xmalloc(len + 1);
			bincode_getstr(
				&bc,
				hashed->header.authors.map[i].entries[j].value,
				len
			);
		}

[19.177]

[20.838]

	for (i = 0; i < hashed->header.authors.len; i++) {
		fn_change_decode_author(&bc, &hashed->header.authors.map[i]);

Insertion in change.c at line 807 [5.1047]
[21.765]
[21.765]

Insertion in change.c at line 815 [5.1047]

[21.979]

[22.253]

/**
 * In the VERSION_NOENC file metadata (for file additions), the
 * filemetadata contains *only* the inodemetadata directly followed by
 * the basename. The basename is not bincode-encoded, so we assume the
 * length of the string is the given content length minus 2 (for the
 * first two bytes used by the inodemetadata).
 */
static void
read_filemetadata_noenc(
	struct filemetadata *m, uint8_t *contents, size_t contents_len
)
{
	size_t len;
	struct bincode bc = { .avail = contents_len, .buf = contents };
	m->inodemetadata = bincode_getu16(&bc);
	len = contents_len - 2;
	m->basename = xmalloc(len + 1);
	memcpy(m->basename, &contents[2], len);
	m->basename[len] = '\0';
}

Insertion in change.c at line 844 [5.1047]

[6.605]

[22.316]

	void (*fn_read_filemetadata)(struct filemetadata *, uint8_t *, size_t);

Insertion in change.c at line 846 [5.1047]

[22.317]

	fn_read_filemetadata = read_filemetadata;
	if (hashed->version == VERSION_NOENC)
		fn_read_filemetadata = read_filemetadata_noenc;

Replacement in change.c at line 917 [5.1047]
B:BD[23.197] → [2.0:23]
```
				read_filemetadata(
```
[23.197]
[2.23]
```
				fn_read_filemetadata(
```
Replacement in change.c at line 944 [5.1047]
B:BD[21.1214] → [21.1214:1236]
```
			read_filemetadata(
```
[21.1214]
[21.1236]
```
			fn_read_filemetadata(
```

Replacement in change.c at line 1074 [5.1047]

B:BD[24.1874] → [25.7277:7348]

∅:D[25.7348] → [19.335:421]

B:BD[19.335] → [19.335:421]

B:BD[19.421] → [25.7349:7374]

∅:D[25.7374] → [19.445:512]

B:BD[19.445] → [19.445:512]

B:BD[19.512] → [25.7375:7400]

∅:D[25.7400] → [19.536:540]

B:BD[19.536] → [19.536:540]

	if (off->version != VERSION) {
		if (off->version == VERSION_NOENC) {
			printf("The NOENC version (%lu) is not yet supported, sorry (but it's planned)\n",
			       off->version);
		} else {
			printf("Version %lu is not yet supported, sorry.\n",
			       off->version);
		}

[24.1874]

[19.540]

	if (off->version != VERSION && off->version != VERSION_NOENC) {
		printf("Version %lu is not yet supported, sorry.\n",
		       off->version);
		err = off->version;

Replacement in change.c at line 1232 [5.1047]
B:BD[25.8278] → [25.8278:8292]
```
	size_t i, x;
```
[25.8278]
[25.8292]
```
	size_t x;
```