KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

otrx: add support for -A (append) and -a (align) options

Browse source 
They are inspired and compatible with the original and mjn3's trx tool.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki 2017-11-13 23:07:47 +01:00
parent 6d283b8029
commit 3f96e57aed
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
package/utils/otrx/src/otrx.c
View file

@ -346,7 +346,7 @@ static int otrx_create(int argc, char **argv) {
fseek(trx, curr_offset, SEEK_SET); fseek(trx, curr_offset, SEEK_SET);
optind = 3; optind = 3;
while ((c = getopt(argc, argv, "f:b:")) != -1) { while ((c = getopt(argc, argv, "f:A:a:b:")) != -1) {
switch (c) { switch (c) {
case 'f': case 'f':
if (curr_idx >= TRX_MAX_PARTS) { if (curr_idx >= TRX_MAX_PARTS) {
@ -370,6 +370,27 @@ static int otrx_create(int argc, char **argv) {
curr_offset += sbytes; curr_offset += sbytes;
break; break;
case 'A':
sbytes = otrx_create_append_file(trx, optarg);
if (sbytes < 0) {
fprintf(stderr, "Failed to append file %s\n", optarg);
} else {
curr_offset += sbytes;
}
sbytes = otrx_create_align(trx, curr_offset, 4);
if (sbytes < 0)
fprintf(stderr, "Failed to append zeros\n");
else
curr_offset += sbytes;
break;
case 'a':
sbytes = otrx_create_align(trx, curr_offset, strtol(optarg, NULL, 0));
if (sbytes < 0)
fprintf(stderr, "Failed to append zeros\n");
else
curr_offset += sbytes;
break;
case 'b': case 'b':
sbytes = strtol(optarg, NULL, 0) - curr_offset; sbytes = strtol(optarg, NULL, 0) - curr_offset;
if (sbytes < 0) { if (sbytes < 0) {
@ -541,6 +562,8 @@ static void usage() {
printf("Creating new TRX file:\n"); printf("Creating new TRX file:\n");
printf("\totrx create <file> [options] [partitions]\n"); printf("\totrx create <file> [options] [partitions]\n");
printf("\t-f file\t\t\t\t[partition] start new partition with content copied from file\n"); printf("\t-f file\t\t\t\t[partition] start new partition with content copied from file\n");
printf("\t-A file\t\t\t\t[partition] append current partition with content copied from file\n");
printf("\t-a alignment\t\t\t[partition] align current partition\n");
printf("\t-b offset\t\t\t[partition] append zeros to partition till reaching absolute offset\n"); printf("\t-b offset\t\t\t[partition] append zeros to partition till reaching absolute offset\n");
printf("\n"); printf("\n");
printf("Extracting from TRX file:\n"); printf("Extracting from TRX file:\n");