laumann/ani - Change R4SKL65GETMZDUYNYY6CV22EPUAFKDA3WGRZGCISHLVETCD6WK4AC

change: support version = 4 (noenc) format

Created by laumann on October 5, 2023

R4SKL65GETMZDUYNYY6CV22EPUAFKDA3WGRZGCISHLVETCD6WK4AC

Dependencies

In discussions

#6 Support VERSION_NOENC (4) change author format

Change contents

Insertion in change.c at line 287 [5.1047]

[4.3754]

}
static void
change_decode_encoding_noenc(struct bincode *bc, char **encoding)
{
	/* Do nothing */

Insertion in change.c at line 303 [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 323 [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 329 [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 341 [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 358 [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 369 [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 406 [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(
```

Replacement in change.c at line 499 [5.1047]

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

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

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

B:BD[13.522] → [15.3897:3938]

∅:D[16.3169] → [13.523:626]

∅:D[15.3938] → [13.523:626]

B:BD[17.1331] → [13.523:626]

B:BD[13.626] → [18.43:176]

		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

[6.502]

[18.176]

		char scratch[4096] = { 0 };
		if (hashed->version == VERSION) {
			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
				// 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
				);
			}
		} else {
			char *name = NULL;
			char *full_name = NULL;
			char *email = NULL;
			size_t n = 1, j = 0;

Deletion in change.c at line 540 [5.1047]

B:BD[18.177] → [18.177:265]

			// TODO switch on offsets.version to figure
			// out how to decode the authors here

Insertion in change.c at line 541 [5.1047]

[7.5778]

[13.627]

			name = xmalloc(len + 1);
			bincode_getstr(&bc, name, len);
			/* optional full_name field */
			if (bincode_getu8(&bc)) {
				len = bincode_getu64(&bc);
				full_name = xmalloc(len + 1);
				bincode_getstr(&bc, full_name, len);
				n++;
			}
			/* optional email field */
			if (bincode_getu8(&bc)) {
				len = bincode_getu64(&bc);
				email = xmalloc(len + 1);
				bincode_getstr(&bc, email, len);
				n++;
			}
			hashed->header.authors.map[i].len = n;
			hashed->header.authors.map[i].entries =
				xmalloc(sizeof(struct author) * n);
			/* decode "name", then two optional fields, making the total length between 1 and 3 */

Replacement in change.c at line 566 [5.1047]

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

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

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

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

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

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

				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
			);

[13.677]

[14.1172]

				xmalloc(5);
			memcpy(hashed->header.authors.map[i].entries[j].key,
			       "name", 4);
			hashed->header.authors.map[i].entries[j].value = name;
			if (full_name) {
				j++;
				hashed->header.authors.map[i].entries[j].key =
					xmalloc(10);
				memcpy(hashed->header.authors.map[i]
					       .entries[j]
					       .key,
				       "full_name", 9);
				hashed->header.authors.map[i].entries[j].value =
					full_name;
			}
			if (email) {
				j++;
				hashed->header.authors.map[i].entries[j].key =
					xmalloc(6);
				memcpy(hashed->header.authors.map[i]
					       .entries[j]
					       .key,
				       "email", 5);
				hashed->header.authors.map[i].entries[j].value =
					email;
			}

Insertion in change.c at line 829 [5.1047]
[19.765]
[19.765]

Insertion in change.c at line 835 [5.1047]

[20.5120]

[19.976]

}
/**
 * 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 866 [5.1047]

[6.605]

[21.316]

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

Insertion in change.c at line 868 [5.1047]

[21.317]

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

Deletion in change.c at line 877 [5.1047]
B:BD[21.523] → [21.523:549]
```
	printf("[[authors]]\n");
```
Insertion in change.c at line 878 [5.1047]
[21.601]
[6.606]
```
		printf("[[authors]]\n");
```
Insertion in change.c at line 885 [5.1047]
[21.814]
[21.814]
```
		printf("\n");
```
Deletion in change.c at line 887 [5.1047]
B:BD[21.817] → [21.817:832]
```
	printf("\n");
```
Insertion in change.c at line 936 [5.1047]
[22.140]
[22.140]
Replacement in change.c at line 940 [5.1047]
B:BD[22.197] → [2.0:23]
```
				read_filemetadata(
```
[22.197]
[2.23]
```
				fn_read_filemetadata(
```
Replacement in change.c at line 967 [5.1047]
B:BD[19.1214] → [19.1214:1236]
```
			read_filemetadata(
```
[19.1214]
[19.1236]
```
			fn_read_filemetadata(
```

Replacement in change.c at line 1097 [5.1047]

B:BD[23.1874] → [20.7277:7348]

∅:D[20.7348] → [18.335:421]

B:BD[18.335] → [18.335:421]

B:BD[18.421] → [20.7349:7374]

∅:D[20.7374] → [18.445:512]

B:BD[18.445] → [18.445:512]

B:BD[18.512] → [20.7375:7400]

∅:D[20.7400] → [18.536:540]

B:BD[18.536] → [18.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);
		}

[23.1874]

[18.540]

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

change: support version = 4 (noenc) format

Dependencies

In discussions

Change contents

Insertion in change.c at line 287 [5.1047]

Insertion in change.c at line 303 [5.1047]

Replacement in change.c at line 323 [5.1047]

Replacement in change.c at line 329 [5.1047]

Replacement in change.c at line 341 [5.1047]

Replacement in change.c at line 358 [5.1047]

Replacement in change.c at line 369 [5.1047]

Replacement in change.c at line 406 [5.1047]

Replacement in change.c at line 499 [5.1047]

Deletion in change.c at line 540 [5.1047]

Insertion in change.c at line 541 [5.1047]

Replacement in change.c at line 566 [5.1047]

Insertion in change.c at line 829 [5.1047]

Insertion in change.c at line 835 [5.1047]

Insertion in change.c at line 866 [5.1047]

Insertion in change.c at line 868 [5.1047]

Deletion in change.c at line 877 [5.1047]

Insertion in change.c at line 878 [5.1047]

Insertion in change.c at line 885 [5.1047]

Deletion in change.c at line 887 [5.1047]

Insertion in change.c at line 936 [5.1047]

Replacement in change.c at line 940 [5.1047]

Replacement in change.c at line 967 [5.1047]

Replacement in change.c at line 1097 [5.1047]