1 files changed, 43 insertions, 5 deletions

diff --git a/utils/bencoding.c b/utils/bencoding.c
index 1e90737..ec5909d 100644
--- a/utils/bencoding.c
+++ b/utils/bencoding.c
@@ -8,7 +8,7 @@
 #define S0(x) (x ? x : "")
 int main (int argc, char ** argv) {
 	if (argc < 1+1)
-		error_at_line(1, 0, __FILE__, __LINE__, "%s encode < json || %s decode < bencoding || %s path path/to/obj < bencoding || %s foreach < bencoding || %s val value < bencoding (should output null or value as JSON string if found in array)", S0(argv[0]), S0(argv[0]), S0(argv[0]), S0(argv[0]), S0(argv[0]));
+		error_at_line(1, 0, __FILE__, __LINE__, "%s encode < json || %s decode < bencoding || %s path path/to/obj < bencoding || %s foreach < bencoding || %s val value < bencoding (should output null or value as JSON string if found in array) || %s insert bencoding [replace] < bencoding || %s compare bencoding < bencoding || %s encode < bencoding", S0(argv[0]), S0(argv[0]), S0(argv[0]), S0(argv[0]), S0(argv[0]), S0(argv[0]), S0(argv[0]), S0(argv[0]));
 	if (argv[1][0] == 'p' && argc != 1+2)
 		error_at_line(1, 0, __FILE__, __LINE__, "set path!");
 	int size = 2048;
@@ -21,8 +21,6 @@ int main (int argc, char ** argv) {
 		if ((size - len) < 1024)
 			in = realloc(in, size *= 2);
 	}
-	if (argv[1][0] == 'e')
-		error_at_line(3, 0, __FILE__, __LINE__, "N/I");
 	struct bencoding * bencoding = bdecode(in, size, 0);
 	if (argv[1][0] == 'd') {
 		len = b2json_length(bencoding);
@@ -45,9 +43,9 @@ int main (int argc, char ** argv) {
 		fprintf(stderr, "len: %d\n", len);
 	}
 	if (argv[1][0] == 'v') {
-		len = b2json_length(bval(bencoding, argv[2]));
+		len = b2json_length(bval(bencoding, bstrs(argv[2])));
 		char out[len+1];
-		char * end = b2json(out, bval(bencoding, argv[2]));
+		char * end = b2json(out, bval(bencoding, bstrs(argv[2])));
 		*end = '\0';
 		puts(out);
 		if (end - out != len)
@@ -72,6 +70,46 @@ int main (int argc, char ** argv) {
 			printf("value(%d): %s\n", len, out2);
 		}
 	}
+	if (argv[1][0] == 'i') {
+		if (argc < 1+2)
+			error_at_line(5, 0, __FILE__, __LINE__, "missing element argument");
+		struct bencoding * elem = bdecode(argv[2], -2, argv[3] ? replace : 0);
+		if (!elem)
+			error_at_line(4, 0, __FILE__, __LINE__, "bdecode of element returned NULL");
+		binsert(bencoding, elem->child);
+		elem->child = NULL;
+		free_bencoding(elem);
+		len = b2json_length(bencoding);
+		char out[len+1];
+		char * end = b2json(out, bencoding);
+		*end = '\0';
+		puts(out);
+		if (end - out != len)
+			error_at_line(4, 0, __FILE__, __LINE__, "b2json wrote %ld instead of %d bytes.", end-out, len);
+		fprintf(stderr, "len: %d\n", len);
+	}
+	if (argv[1][0] == 'c') {
+		struct bencoding * elem = bdecode(argv[2], -2, 0);
+		switch (bcompare(bencoding, elem)) {
+			case -1:
+				fprintf(stdout, "stdin is less than argv\n");
+				break;
+			case 0:
+				fprintf(stdout, "stdin is same as argv\n");
+				break;
+			case 1:
+				fprintf(stdout, "stdin is greater than argv\n");
+				break;
+		}
+		free_bencoding(elem);
+	}
+	if (argv[1][0] == 'e') {
+		int len = bencode_length(bencoding);
+		char bencoded[len+1];
+		bencoded[len] = '\0';
+		bencode(bencoded, bencoding);
+		puts(bencoded);
+	}
 	free_bencoding(bencoding);
 	free(in);
 	return 0;