otrx: bump buffer size in otrx_create_append_file

[openwrt/staging/chunkeey.git] / package / utils / otrx / src / otrx.c

diff --git a/package/utils/otrx/src/otrx.c b/package/utils/otrx/src/otrx.c
index d08507f685cbbd4c8ab943826f1737c0a61dba9e..0d99cd39e3e21321236522a2e50e9016be29d15d 100644 (file)
--- a/package/utils/otrx/src/otrx.c
+++ b/package/utils/otrx/src/otrx.c
@@ -1,7 +1,7 @@
 /*
  * otrx
  *
- * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
+ * Copyright (C) 2015-2017 Rafał Miłecki <zajec5@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -228,14 +228,11 @@ out:
  * Create
  **************************************************/
 
-static void otrx_create_parse_options(int argc, char **argv) {
-}
-
 static ssize_t otrx_create_append_file(FILE *trx, const char *in_path) {
        FILE *in;
        size_t bytes;
        ssize_t length = 0;
-       uint8_t buf[128];
+       uint8_t buf[1024];
 
        in = fopen(in_path, "r");
        if (!in) {
@@ -334,9 +331,6 @@ static int otrx_create(int argc, char **argv) {
        }
        trx_path = argv[2];
 
-       optind = 3;
-       otrx_create_parse_options(argc, argv);
-
        trx = fopen(trx_path, "w+");
        if (!trx) {
                fprintf(stderr, "Couldn't open %s\n", trx_path);
@@ -346,7 +340,7 @@ static int otrx_create(int argc, char **argv) {
        fseek(trx, curr_offset, SEEK_SET);
 
        optind = 3;
-       while ((c = getopt(argc, argv, "f:b:")) != -1) {
+       while ((c = getopt(argc, argv, "f:A:a:b:")) != -1) {
                switch (c) {
                case 'f':
                        if (curr_idx >= TRX_MAX_PARTS) {
@@ -370,6 +364,27 @@ static int otrx_create(int argc, char **argv) {
                                curr_offset += sbytes;
 
                        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':
                        sbytes = strtol(optarg, NULL, 0) - curr_offset;
                        if (sbytes < 0) {
@@ -387,6 +402,12 @@ static int otrx_create(int argc, char **argv) {
                        break;
        }
 
+       sbytes = otrx_create_align(trx, curr_offset, 0x1000);
+       if (sbytes < 0)
+               fprintf(stderr, "Failed to append zeros\n");
+       else
+               curr_offset += sbytes;
+
        hdr.length = curr_offset;
        otrx_create_write_hdr(trx, &hdr);
 err_close:
@@ -541,6 +562,8 @@ static void usage() {
        printf("Creating new TRX file:\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-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("\n");
        printf("Extracting from TRX file:\n");