Index: stable/11/usr.sbin/nandtool/nand_read.c =================================================================== --- stable/11/usr.sbin/nandtool/nand_read.c (revision 327651) +++ stable/11/usr.sbin/nandtool/nand_read.c (revision 327652) @@ -1,139 +1,139 @@ /*- * Copyright (c) 2010-2012 Semihalf. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include "nandtool.h" int nand_read(struct cmd_param *params) { struct chip_param_io chip_params; int fd = -1, out_fd = -1, done = 0, ret = 0; char *dev, *out; int pos, count, mult, block_size; uint8_t *buf = NULL; if (!(dev = param_get_string(params, "dev"))) { fprintf(stderr, "You must specify 'dev' parameter\n"); return (1); } if ((out = param_get_string(params, "out"))) { - out_fd = open(out, O_WRONLY|O_CREAT); + out_fd = open(out, O_WRONLY|O_CREAT, 0666); if (out_fd == -1) { perrorf("Cannot open %s for writing", out); return (1); } } if ((fd = g_open(dev, 1)) == -1) { perrorf("Cannot open %s", dev); ret = 1; goto out; } if (ioctl(fd, NAND_IO_GET_CHIP_PARAM, &chip_params) == -1) { perrorf("Cannot ioctl(NAND_IO_GET_CHIP_PARAM)"); ret = 1; goto out; } block_size = chip_params.page_size * chip_params.pages_per_block; if (param_has_value(params, "page")) { pos = chip_params.page_size * param_get_int(params, "page"); mult = chip_params.page_size; } else if (param_has_value(params, "block")) { pos = block_size * param_get_int(params, "block"); mult = block_size; } else if (param_has_value(params, "pos")) { pos = param_get_int(params, "pos"); mult = 1; if (pos % chip_params.page_size) { fprintf(stderr, "Position must be page-size aligned!\n"); ret = 1; goto out; } } else { fprintf(stderr, "You must specify one of: 'block', 'page'," "'pos' arguments\n"); ret = 1; goto out; } if (!(param_has_value(params, "count"))) count = mult; else count = param_get_int(params, "count") * mult; if (!(buf = malloc(chip_params.page_size))) { perrorf("Cannot allocate buffer [size %x]", chip_params.page_size); ret = 1; goto out; } lseek(fd, pos, SEEK_SET); while (done < count) { if ((ret = read(fd, buf, chip_params.page_size)) != (int32_t)chip_params.page_size) { perrorf("read error (read %d bytes)", ret); goto out; } if (out_fd != -1) { done += ret; if ((ret = write(out_fd, buf, chip_params.page_size)) != (int32_t)chip_params.page_size) { perrorf("write error (written %d bytes)", ret); ret = 1; goto out; } } else { hexdumpoffset(buf, chip_params.page_size, done); done += ret; } } out: g_close(fd); if (out_fd != -1) close(out_fd); if (buf) free(buf); return (ret); } Index: stable/11/usr.sbin/nandtool/nand_readoob.c =================================================================== --- stable/11/usr.sbin/nandtool/nand_readoob.c (revision 327651) +++ stable/11/usr.sbin/nandtool/nand_readoob.c (revision 327652) @@ -1,111 +1,111 @@ /*- * Copyright (c) 2010-2012 Semihalf. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include "nandtool.h" int nand_read_oob(struct cmd_param *params) { struct chip_param_io chip_params; struct nand_oob_rw req; char *dev, *out; int fd = -1, fd_out = -1, ret = 0; int page; uint8_t *buf = NULL; if ((page = param_get_int(params, "page")) < 0) { fprintf(stderr, "You must supply valid 'page' argument.\n"); return (1); } if (!(dev = param_get_string(params, "dev"))) { fprintf(stderr, "You must supply 'dev' argument.\n"); return (1); } if ((out = param_get_string(params, "out"))) { - if ((fd_out = open(out, O_WRONLY | O_CREAT)) == -1) { + if ((fd_out = open(out, O_WRONLY | O_CREAT, 0666)) == -1) { perrorf("Cannot open %s", out); ret = 1; goto out; } } if ((fd = g_open(dev, 1)) == -1) { perrorf("Cannot open %s", dev); ret = 1; goto out; } if (ioctl(fd, NAND_IO_GET_CHIP_PARAM, &chip_params) == -1) { perrorf("Cannot ioctl(NAND_IO_GET_CHIP_PARAM)"); ret = 1; goto out; } buf = malloc(chip_params.oob_size); if (buf == NULL) { perrorf("Cannot allocate %d bytes\n", chip_params.oob_size); ret = 1; goto out; } req.page = page; req.len = chip_params.oob_size; req.data = buf; if (ioctl(fd, NAND_IO_OOB_READ, &req) == -1) { perrorf("Cannot read OOB from %s", dev); ret = 1; goto out; } if (fd_out != -1) write(fd_out, buf, chip_params.oob_size); else hexdump(buf, chip_params.oob_size); out: close(fd_out); if (fd != -1) g_close(fd); if (buf) free(buf); return (ret); } Index: stable/11 =================================================================== --- stable/11 (revision 327651) +++ stable/11 (revision 327652) Property changes on: stable/11 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r327211