|
|
@ -31,6 +31,10 @@
|
|
|
|
* Sigh... Make it endian-neutral.
|
|
|
|
* Sigh... Make it endian-neutral.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* TODO: Support '-b' option to specify offsets for each file.
|
|
|
|
* TODO: Support '-b' option to specify offsets for each file.
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* February 19, 2005 - mbm
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* Add -a (align offset) and -b (absolute offset)
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdio.h>
|
|
|
@ -75,7 +79,7 @@ void usage(void) __attribute__ (( __noreturn__ ));
|
|
|
|
|
|
|
|
|
|
|
|
void usage(void)
|
|
|
|
void usage(void)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
fprintf(stderr, "Usage: trx [-o outfile] [-m maxlen] file [file [file]]\n");
|
|
|
|
fprintf(stderr, "Usage: trx [-o outfile] [-m maxlen] [-a align] [-b offset] file [file [file]]\n");
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -92,53 +96,7 @@ int main(int argc, char **argv)
|
|
|
|
unsigned long maxlen = TRX_MAX_LEN;
|
|
|
|
unsigned long maxlen = TRX_MAX_LEN;
|
|
|
|
struct trx_header *p;
|
|
|
|
struct trx_header *p;
|
|
|
|
|
|
|
|
|
|
|
|
fprintf(stderr, "mjn3's trx replacement - v0.81\n");
|
|
|
|
fprintf(stderr, "mjn3's trx replacement - v0.81.1\n");
|
|
|
|
|
|
|
|
|
|
|
|
while ((c = getopt(argc, argv, "o:m:")) != -1) {
|
|
|
|
|
|
|
|
switch (c) {
|
|
|
|
|
|
|
|
case 'o':
|
|
|
|
|
|
|
|
ofn = optarg;
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'm':
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
|
|
|
|
maxlen = strtoul(optarg, &e, 0);
|
|
|
|
|
|
|
|
if (errno || (e == optarg) || *e) {
|
|
|
|
|
|
|
|
fprintf(stderr, "illegal numeric string\n");
|
|
|
|
|
|
|
|
usage();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef ROUND
|
|
|
|
|
|
|
|
#define ROUND 0x1000
|
|
|
|
|
|
|
|
if (maxlen & (ROUND-1)) {
|
|
|
|
|
|
|
|
maxlen += (ROUND - (maxlen & (ROUND-1)));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (maxlen < ROUND) {
|
|
|
|
|
|
|
|
fprintf(stderr, "maxlen too small (or wrapped)\n");
|
|
|
|
|
|
|
|
usage();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
|
|
usage();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (ofn && !(out = fopen(ofn, "w"))) {
|
|
|
|
|
|
|
|
fprintf(stderr, "can not open \"%s\" for writing\n", ofn);
|
|
|
|
|
|
|
|
usage();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (optind == argc) {
|
|
|
|
|
|
|
|
fprintf(stderr, "we require at least one arg\n");
|
|
|
|
|
|
|
|
usage();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (argc - optind > 3) {
|
|
|
|
|
|
|
|
fprintf(stderr, "too many args: %d > 3\n", argc - optind);
|
|
|
|
|
|
|
|
usage();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (maxlen > TRX_MAX_LEN) {
|
|
|
|
|
|
|
|
fprintf(stderr, "WARNING: maxlen exceeds default maximum! Beware of overwriting nvram!\n");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!(buf = malloc(maxlen))) {
|
|
|
|
if (!(buf = malloc(maxlen))) {
|
|
|
|
fprintf(stderr, "malloc failed\n");
|
|
|
|
fprintf(stderr, "malloc failed\n");
|
|
|
@ -151,39 +109,91 @@ int main(int argc, char **argv)
|
|
|
|
cur_len = sizeof(struct trx_header);
|
|
|
|
cur_len = sizeof(struct trx_header);
|
|
|
|
p->flag_version = STORE32_LE((TRX_VERSION << 16));
|
|
|
|
p->flag_version = STORE32_LE((TRX_VERSION << 16));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
in = NULL;
|
|
|
|
i = 0;
|
|
|
|
i = 0;
|
|
|
|
|
|
|
|
|
|
|
|
while (optind < argc) {
|
|
|
|
while ((c = getopt(argc, argv, "-:o:m:a:b:")) != -1) {
|
|
|
|
|
|
|
|
switch (c) {
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
p->offsets[i++] = STORE32_LE(cur_len);
|
|
|
|
p->offsets[i++] = STORE32_LE(cur_len);
|
|
|
|
|
|
|
|
|
|
|
|
if (!(in = fopen(argv[optind], "r"))) {
|
|
|
|
if (!(in = fopen(optarg, "r"))) {
|
|
|
|
fprintf(stderr, "can not open \"%s\" for reading\n", argv[optind]);
|
|
|
|
fprintf(stderr, "can not open \"%s\" for reading\n", optarg);
|
|
|
|
usage();
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
n = fread(buf + cur_len, 1, maxlen - cur_len, in);
|
|
|
|
n = fread(buf + cur_len, 1, maxlen - cur_len, in);
|
|
|
|
if (!feof(in)) {
|
|
|
|
if (!feof(in)) {
|
|
|
|
fprintf(stderr, "fread failure or file \"%s\" too large\n",
|
|
|
|
fprintf(stderr, "fread failure or file \"%s\" too large\n",optarg);
|
|
|
|
argv[optind]);
|
|
|
|
|
|
|
|
fclose(in);
|
|
|
|
fclose(in);
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fclose(in);
|
|
|
|
fclose(in);
|
|
|
|
|
|
|
|
|
|
|
|
++optind;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (optind < argc) {
|
|
|
|
|
|
|
|
#undef ROUND
|
|
|
|
#undef ROUND
|
|
|
|
#define ROUND 4
|
|
|
|
#define ROUND 4
|
|
|
|
if (n & (ROUND-1)) {
|
|
|
|
if (n & (ROUND-1)) {
|
|
|
|
memset(buf + cur_len + n, 0, ROUND - (n & (ROUND-1)));
|
|
|
|
memset(buf + cur_len + n, 0, ROUND - (n & (ROUND-1)));
|
|
|
|
n += ROUND - (n & (ROUND-1));
|
|
|
|
n += ROUND - (n & (ROUND-1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
cur_len += n;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'o':
|
|
|
|
|
|
|
|
ofn = optarg;
|
|
|
|
|
|
|
|
if (ofn && !(out = fopen(ofn, "w"))) {
|
|
|
|
|
|
|
|
fprintf(stderr, "can not open \"%s\" for writing\n", ofn);
|
|
|
|
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'm':
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
|
|
|
|
maxlen = strtoul(optarg, &e, 0);
|
|
|
|
|
|
|
|
if (errno || (e == optarg) || *e) {
|
|
|
|
|
|
|
|
fprintf(stderr, "illegal numeric string\n");
|
|
|
|
|
|
|
|
usage();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef ROUND
|
|
|
|
|
|
|
|
#define ROUND 0x1000
|
|
|
|
|
|
|
|
if (maxlen & (ROUND-1)) {
|
|
|
|
|
|
|
|
maxlen += (ROUND - (maxlen & (ROUND-1)));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (maxlen < ROUND) {
|
|
|
|
|
|
|
|
fprintf(stderr, "maxlen too small (or wrapped)\n");
|
|
|
|
|
|
|
|
usage();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (maxlen > TRX_MAX_LEN) {
|
|
|
|
|
|
|
|
fprintf(stderr, "WARNING: maxlen exceeds default maximum! Beware of overwriting nvram!\n");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(buf = realloc(buf,maxlen))) {
|
|
|
|
|
|
|
|
fprintf(stderr, "realloc failed");
|
|
|
|
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'a':
|
|
|
|
|
|
|
|
n = atoi(optarg);
|
|
|
|
|
|
|
|
if (cur_len & (n-1)) {
|
|
|
|
|
|
|
|
n = n - (cur_len & (n-1));
|
|
|
|
|
|
|
|
memset(buf + cur_len, 0, n);
|
|
|
|
cur_len += n;
|
|
|
|
cur_len += n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'b':
|
|
|
|
|
|
|
|
n = atoi(optarg);
|
|
|
|
|
|
|
|
if (n < cur_len) {
|
|
|
|
|
|
|
|
fprintf(stderr, "WARNING: current length exceeds -b %d offset",n);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
memset(buf + cur_len, 0, n - cur_len);
|
|
|
|
|
|
|
|
cur_len = n;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
|
|
usage();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!in) {
|
|
|
|
|
|
|
|
fprintf(stderr, "we require atleast one filename\n");
|
|
|
|
|
|
|
|
usage();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#undef ROUND
|
|
|
|
#undef ROUND
|
|
|
|
#define ROUND 0x1000
|
|
|
|
#define ROUND 0x1000
|
|
|
|