From c460c800baa1f5fd402249448728ea459dc9b3e3 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 27 Mar 2010 17:38:26 +0000 Subject: firmware-utils/trx: add relative offset parameter * will be used for the WRT160NL board * patch by Bernhard Loos * note: rejected parts has been fixed git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20522 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- tools/firmware-utils/src/trx.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/firmware-utils/src/trx.c b/tools/firmware-utils/src/trx.c index 728deac37..44bd06a06 100644 --- a/tools/firmware-utils/src/trx.c +++ b/tools/firmware-utils/src/trx.c @@ -83,7 +83,7 @@ void usage(void) __attribute__ (( __noreturn__ )); void usage(void) { fprintf(stderr, "Usage:\n"); - fprintf(stderr, " trx [-2] [-o outfile] [-m maxlen] [-a align] [-b offset] \\\n"); + fprintf(stderr, " trx [-2] [-o outfile] [-m maxlen] [-a align] [-b absolute offset] [-x relative offset]\n"); fprintf(stderr, " [-f file] [-f file [-f file [-f file (v2 only)]]]\n"); exit(EXIT_FAILURE); } @@ -97,6 +97,7 @@ int main(int argc, char **argv) char *e; int c, i, append = 0; size_t n; + ssize_t n2; uint32_t cur_len; unsigned long maxlen = TRX_MAX_LEN; struct trx_header *p; @@ -118,7 +119,7 @@ int main(int argc, char **argv) in = NULL; i = 0; - while ((c = getopt(argc, argv, "-:2o:m:a:b:f:A:")) != -1) { + while ((c = getopt(argc, argv, "-:2o:m:a:x:b:f:A:")) != -1) { switch (c) { case '2': /* take care that nothing was written to buf so far */ @@ -218,6 +219,25 @@ int main(int argc, char **argv) memset(buf + cur_len, 0, n - cur_len); cur_len = n; } + break; + case 'x': + errno = 0; + n2 = strtol(optarg, &e, 0); + if (errno || (e == optarg) || *e) { + fprintf(stderr, "illegal numeric string\n"); + usage(); + } + if (n2 < 0) { + if (-n2 > cur_len) { + fprintf(stderr, "WARNING: current length smaller then -x %d offset\n",n2); + cur_len = 0; + } else + cur_len += n2; + } else { + memset(buf + cur_len, 0, n2); + cur_len += n2; + } + break; default: usage(); -- cgit v1.2.3