Added injecting to bmp.

Author: jklmnn

bmp.c

@@ -38,6 +38,17 @@ char *bmp_js_v(char *content, int size){
 	return buffer;
 }
 
+char *bmp_js_i(char *content, int csize, char *image, int isize){
+	const char _bmp_header[7] = {0x42, 0x4d, 0x3d, 0x30, 0x3b, 0x2f, 0x2a};
+	const char _bmp_header_end[BMP_JS_HEADER_I] = {0x2a, 0x2f, 0x3b};
+	char *buffer = (char*)malloc(csize + isize + BMP_JS_HEADER_I);
+	memcpy(buffer, _bmp_header, 7);
+	memcpy(&buffer[7], &image[7], isize - 7);
+	memcpy(&buffer[isize], _bmp_header_end, BMP_JS_HEADER_I);
+	memcpy(&buffer[isize + BMP_JS_HEADER_I], content, csize);
+	return buffer;
+}
+
 char *bmp_filename(char *fn, int size){
 	const char _bmp_ending[BMP_ENDING] = {0x2e, 0x62, 0x6d, 0x70, 0x00};
 	char *newfile = (char*)malloc(size + BMP_ENDING);

bmp.h

@@ -15,10 +15,12 @@ License: GNU GENERAL PUBLIC LICENSE Version 3
 
 #define BMP_JS_HEADER 139
 #define BMP_JS_HEADER_V 134
+#define BMP_JS_HEADER_I 3
 #define BMP_ENDING 5
 
 char *bmp_js(char*, int);
 char *bmp_js_v(char*, int);
+char *bmp_js_i(char*, int, char*, int);
 char *bmp_filename(char*, int);
 
 #endif

main.c

@@ -71,15 +71,39 @@ int main(int argc, char *argv[]){
 	char *outbuf;
 	if(strcmp(argv[1], "bmp") == 0){
 		if(argc > 3){
-			if(strcmp(argv[3], "-l") == 0){
-				outbuf = bmp_js_v(buf, filesize);
-				out = fopen(bmp_filename(argv[2], getlen(argv[2])), "wb");
-				for(int i = 0; i < filesize + BMP_JS_HEADER_V; i++){
-					fprintf(out, "%c", outbuf[i]);
+			if(argc > 4){
+				FILE *im = fopen(argv[4], "rb");
+				if(im){
+					fseek(im, 0, SEEK_END);
+					int imsize = ftell(im);
+					rewind(im);
+					char *imbuf = (char*)malloc(imsize * sizeof(char));
+					fread(imbuf, 1, imsize, im);
+					fclose(im);
+					outbuf = bmp_js_i(buf, filesize, imbuf, imsize);
+					out = fopen(bmp_filename(argv[2], getlen(argv[2])), "wb");
+					for(int i = 0; i < (filesize + imsize + BMP_JS_HEADER_I); i++){
+						fprintf(out, "%c", outbuf[i]);
+					}
+					free(imbuf);
+				}else{
+					_help(argv[4], 3);
+					return 2;
 				}
+			}else if(strcmp(argv[3] , "-i") == 0){
+				_help(argv[3], 2);
+				return 2;
 			}else{
-				_help(argv[3], 1);
-				return 3;
+				if(strcmp(argv[3], "-l") == 0){
+					outbuf = bmp_js_v(buf, filesize);
+					out = fopen(bmp_filename(argv[2], getlen(argv[2])), "wb");
+					for(int i = 0; i < filesize + BMP_JS_HEADER_V; i++){
+						fprintf(out, "%c", outbuf[i]);
+					}
+				}else{
+					_help(argv[3], 1);
+					return 3;
+				}
 			}
 		}else{
 			outbuf = bmp_js(buf, filesize);