From 716ca530e1c4515d8683c9d5be3d56b301758b66 Mon Sep 17 00:00:00 2001 From: James <> Date: Wed, 4 Nov 2015 11:49:21 +0000 Subject: trunk-47381 --- tools/padjffs2/Makefile | 36 ++++++++ tools/padjffs2/src/Makefile | 15 ++++ tools/padjffs2/src/padjffs2.c | 198 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 249 insertions(+) create mode 100644 tools/padjffs2/Makefile create mode 100644 tools/padjffs2/src/Makefile create mode 100644 tools/padjffs2/src/padjffs2.c (limited to 'tools/padjffs2') diff --git a/tools/padjffs2/Makefile b/tools/padjffs2/Makefile new file mode 100644 index 0000000..0a583b8 --- /dev/null +++ b/tools/padjffs2/Makefile @@ -0,0 +1,36 @@ +# +# Copyright (C) 2011-2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=padjffs2 +PKG_VERSION:=1 + +include $(INCLUDE_DIR)/host-build.mk + +define Host/Prepare + mkdir -p $(HOST_BUILD_DIR) + $(CP) ./src/* $(HOST_BUILD_DIR)/ + find $(HOST_BUILD_DIR) -name .svn | $(XARGS) rm -rf +endef + +define Host/Compile + $(MAKE) -C $(HOST_BUILD_DIR) +endef + +define Host/Configure +endef + +define Host/Install + $(CP) $(HOST_BUILD_DIR)/padjffs2 $(STAGING_DIR_HOST)/bin/ +endef + +define Host/Clean + rm -f $(STAGING_DIR_HOST)/bin/padjffs2 +endef + +$(eval $(call HostBuild)) diff --git a/tools/padjffs2/src/Makefile b/tools/padjffs2/src/Makefile new file mode 100644 index 0000000..45da8e5 --- /dev/null +++ b/tools/padjffs2/src/Makefile @@ -0,0 +1,15 @@ +CC = gcc +CFLAGS = +WFLAGS = -Wall -Werror +padjffs2-objs = padjffs2.o + +all: padjffs2 + +%.o: %.c + $(CC) $(CFLAGS) $(WFLAGS) -c -o $@ $< + +padjffs2: $(padjffs2-objs) + $(CC) $(LDFLAGS) -o $@ $(padjffs2-objs) + +clean: + rm -f padjffs2 *.o diff --git a/tools/padjffs2/src/padjffs2.c b/tools/padjffs2/src/padjffs2.c new file mode 100644 index 0000000..59c7625 --- /dev/null +++ b/tools/padjffs2/src/padjffs2.c @@ -0,0 +1,198 @@ +/* + * Copyright (C) 2011 Gabor Juhos + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static char *progname; +static unsigned int xtra_offset; +static unsigned char eof_mark[4] = {0xde, 0xad, 0xc0, 0xde}; +static unsigned char jffs2_pad_be[] = "\x19\x85\x20\x04\x04\x00\x00\x00\xc4\x94\xdb\xf4"; +static unsigned char jffs2_pad_le[] = "\x85\x19\x04\x20\x00\x00\x00\x04\xa8\xfb\xa0\xb4"; +static unsigned char *pad = eof_mark; +static int pad_len = sizeof(eof_mark); + +#define ERR(fmt, ...) do { \ + fflush(0); \ + fprintf(stderr, "[%s] *** error: " fmt "\n", \ + progname, ## __VA_ARGS__ ); \ +} while (0) + +#define ERRS(fmt, ...) do { \ + int save = errno; \ + fflush(0); \ + fprintf(stderr, "[%s] *** error: " fmt ", %s\n", \ + progname, ## __VA_ARGS__, strerror(save)); \ +} while (0) + +#define BUF_SIZE (64 * 1024) +#define ALIGN(_x,_y) (((_x) + ((_y) - 1)) & ~((_y) - 1)) + +static int pad_image(char *name, uint32_t pad_mask) +{ + char *buf; + int fd; + ssize_t in_len; + ssize_t out_len; + int ret = -1; + + buf = malloc(BUF_SIZE); + if (!buf) { + ERR("No memory for buffer"); + goto out; + } + + fd = open(name, O_RDWR); + if (fd < 0) { + ERRS("Unable to open %s", name); + goto free_buf; + } + + in_len = lseek(fd, 0, SEEK_END); + if (in_len < 0) + goto close; + + memset(buf, '\xff', BUF_SIZE); + + in_len += xtra_offset; + + out_len = in_len; + while (pad_mask) { + uint32_t mask; + ssize_t t; + int i; + + for (i = 10; i < 32; i++) { + mask = 1UL << i; + if (pad_mask & mask) + break; + } + + in_len = ALIGN(in_len, mask); + + for (i = 10; i < 32; i++) { + mask = 1UL << i; + if ((in_len & (mask - 1)) == 0) + pad_mask &= ~mask; + } + + printf("padding image to %08x\n", (unsigned int) in_len - xtra_offset); + + while (out_len < in_len) { + ssize_t len; + + len = in_len - out_len; + if (len > BUF_SIZE) + len = BUF_SIZE; + + t = write(fd, buf, len); + if (t != len) { + ERRS("Unable to write to %s", name); + goto close; + } + + out_len += len; + } + + /* write out the JFFS end-of-filesystem marker */ + t = write(fd, pad, pad_len); + if (t != pad_len) { + ERRS("Unable to write to %s", name); + goto close; + } + out_len += pad_len; + } + + ret = 0; + +close: + close(fd); +free_buf: + free(buf); +out: + return ret; +} + +static int usage(void) +{ + fprintf(stderr, + "Usage: %s file [] [pad0] [pad1] [padN]\n" + "Options:\n" + " -x : Add an extra offset for padding data\n" + " -J: Use a fake big-endian jffs2 padding element instead of EOF\n" + " This is used to work around broken boot loaders that\n" + " try to parse the entire firmware area as one big jffs2\n" + " -j: (like -J, but little-endian instead of big-endian)\n" + "\n", + progname); + return EXIT_FAILURE; +} + +int main(int argc, char* argv[]) +{ + char *image; + uint32_t pad_mask; + int ret = EXIT_FAILURE; + int err; + int ch, i; + + progname = basename(argv[0]); + + if (argc < 2) + return usage(); + + image = argv[1]; + argv++; + argc--; + + pad_mask = 0; + while ((ch = getopt(argc, argv, "x:Jj")) != -1) { + switch (ch) { + case 'x': + xtra_offset = strtoul(optarg, NULL, 0); + fprintf(stderr, "assuming %u bytes offset\n", + xtra_offset); + break; + case 'J': + pad = jffs2_pad_be; + pad_len = sizeof(jffs2_pad_be) - 1; + break; + case 'j': + pad = jffs2_pad_le; + pad_len = sizeof(jffs2_pad_le) - 1; + break; + default: + return usage(); + } + } + + for (i = optind; i < argc; i++) + pad_mask |= strtoul(argv[i], NULL, 0) * 1024; + + if (pad_mask == 0) + pad_mask = (4 * 1024) | (8 * 1024) | (64 * 1024) | + (128 * 1024); + + err = pad_image(image, pad_mask); + if (err) + goto out; + + ret = EXIT_SUCCESS; + +out: + return ret; +} -- cgit v1.2.3