--- embedtools/src/imgupd.c 2014/02/05 15:44:06 1.2 +++ embedtools/src/imgupd.c 2014/02/06 00:56:16 1.6.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: imgupd.c,v 1.2 2014/02/05 15:44:06 misho Exp $ + * $Id: imgupd.c,v 1.6.2.3 2014/02/06 00:56:16 misho Exp $ * ************************************************************************* The ELWIX and AITNET software is distributed under the following @@ -47,8 +47,8 @@ SUCH DAMAGE. char imgName[PATH_MAX], imgFile[PATH_MAX]; -off_t imgSize, iSize; -int Verbose; +off_t imgSize, iSize, fromBegin; +int Verbose, bufSize = IMGBUF_SIZE; extern char compiled[], compiledby[], compilehost[]; static void @@ -57,8 +57,12 @@ Usage() printf( "IMGUPD is tool for management of images\n" "=== %s === %s@%s ===\n\n" - " Syntax: imgupd [options] \n\n" + " Syntax: imgupd [options] [image_file]\n\n" "\t-v\t\tVerbose ...\n" + "\t-R\t\tReboot system after complete\n" + "\t-p\t\tPipe suitable transfer on little chunks\n" + "\t-i\t\tStart fill storage from begin\n" + "\t-g\t\tGet image from Storage\n" "\t-t\t\tTruncate Storage file name\n" "\t-s \tStorage size (required for stdin)\n" "\t-f \tStorage file name\n" @@ -69,24 +73,27 @@ static int EmptyStore(int img) { register int i; - u_char buf[IMGBUF_SIZE]; + u_char buf[bufSize]; ssize_t wlen; VERB(1) printf("Erase store %s\n", imgName); - iSize = lseek(img, 0, SEEK_END); - if (iSize == -1) { - ESYSERR(0); - return -1; + if (!fromBegin) { + iSize = lseek(img, 0, SEEK_END); + if (iSize == -1) { + ESYSERR(0); + return -1; + } else + imgSize += E_ALIGN(iSize, bufSize); } else - imgSize += E_ALIGN(iSize, IMGBUF_SIZE); + iSize ^= iSize; memset(buf, 0, sizeof buf); - for (i = howmany(iSize, IMGBUF_SIZE); i < howmany(imgSize, IMGBUF_SIZE); i++) - if ((wlen = write(img, buf, sizeof buf)) == -1 || - wlen != sizeof buf) { - EERROR(EIO, "Error at chunk %d init %d bytes, should be %u\n", - i, wlen, sizeof buf); + for (i = howmany(iSize, bufSize); i < howmany(imgSize, bufSize); i++) + if ((wlen = write(img, buf, bufSize)) == -1 || + (wlen && wlen != bufSize)) { + EERROR(EIO, "Error at chunk %d init %d bytes, " + "should be %u\n", i, wlen, bufSize); return -1; } else VERB(1) printf("+Written chunk #%d\n", i); @@ -99,15 +106,15 @@ static int FillStore(int img, int fd) { register int i, j; - u_char buf[IMGBUF_SIZE]; + u_char buf[bufSize]; ssize_t rlen, wlen; VERB(1) printf("Fill store %s from image file %s\n", imgName, imgFile); - for (j = 0, i = howmany(iSize, IMGBUF_SIZE); i < howmany(imgSize, IMGBUF_SIZE); + for (j = 0, i = howmany(iSize, bufSize); i < howmany(imgSize, bufSize); i++, j++) { memset(buf, 0, sizeof buf); - rlen = read(fd, buf, sizeof buf); + rlen = read(fd, buf, bufSize); if (rlen == -1) { ESYSERR(0); return -1; @@ -116,13 +123,13 @@ FillStore(int img, int fd) else VERB(1) printf("+Readed %d bytes for chunk #%d\n", rlen, j); - wlen = write(img, buf, rlen); + wlen = write(img, buf, bufSize); if (wlen == -1) { ESYSERR(0); return -1; - } else if (!wlen || wlen != rlen) { - EERROR(EIO, "Readed %d bytes are not equal to written %d bytes\n", - rlen, wlen); + } else if (wlen && wlen != bufSize) { + EERROR(EIO, "Error at chunk %d written %d bytes, " + "should be %u\n", i, wlen, bufSize); } else VERB(1) printf("+Written %d bytes at chunk #%d\n", wlen, i); } @@ -133,10 +140,10 @@ FillStore(int img, int fd) int main(int argc, char **argv) { - char ch; + char ch, m = 0, R = 0; int fd, img, tr = 0; - while ((ch = getopt(argc, argv, "hvts:f:")) != -1) + while ((ch = getopt(argc, argv, "hvRipgts:f:")) != -1) switch (ch) { case 'f': strlcpy(imgName, optarg, sizeof imgName); @@ -151,6 +158,17 @@ main(int argc, char **argv) case 't': tr = O_TRUNC; break; + case 'p': + bufSize = IMGBUF_SIZE2; + break; + case 'g': + m = 1; + case 'i': + fromBegin = 1; + break; + case 'R': + R = 1; + break; case 'v': Verbose++; break; @@ -162,59 +180,116 @@ main(int argc, char **argv) argc -= optind; argv += optind; - if (argc) { - strlcpy(imgFile, *argv, sizeof imgFile); - /* open image file */ - fd = open(imgFile, O_RDONLY); - if (fd == -1) { - ESYSERR(0); - return 2; + if (!m) { + if (argc) { + strlcpy(imgFile, *argv, sizeof imgFile); + /* open image file */ + fd = open(imgFile, O_RDONLY); + if (fd == -1) { + ESYSERR(0); + return 2; + } else + iSize = lseek(fd, 0, SEEK_END); + if (!imgSize) + imgSize = E_ALIGN(iSize, bufSize); + if (iSize == -1 || iSize > imgSize) { + close(fd); + EERROR(ENOSPC, "Error:: file size %llu is " + "greater from storage size %llu\n", + iSize, imgSize); + return 2; + } else + lseek(fd, 0, SEEK_SET); + } else if (!imgSize) { + Usage(); + return 1; } else - iSize = lseek(fd, 0, SEEK_END); - if (!imgSize) - imgSize = E_ALIGN(iSize, IMGBUF_SIZE); - if (iSize == -1 || iSize > imgSize) { - close(fd); - EERROR(ENOSPC, "Error:: file size %llu is greater from storage size %llu\n", - iSize, imgSize); - return 2; + fd = STDIN_FILENO; + } else { /* GET */ + if (argc) { + strlcpy(imgFile, *argv, sizeof imgFile); + /* open image file */ + fd = open(imgFile, O_WRONLY | O_TRUNC | O_CREAT, 0644); + if (fd == -1) { + ESYSERR(0); + return 2; + } + } else if (!imgSize) { + Usage(); + return 1; } else - lseek(fd, 0, SEEK_SET); - } else if (!imgSize) { - Usage(); - return 1; - } else - fd = STDIN_FILENO; + fd = STDOUT_FILENO; + } VERB(1) printf("imgSize=%llu imgName=%s imgFile=%s\n", imgSize, imgName, argc ? imgFile : ""); - /* open storage device */ - img = open(imgName, O_RDWR | O_CREAT | tr, 0644); - if (img == -1) { - ESYSERR(0); - if (fd > 2) - close(fd); - return 3; + if (!m) { + /* open storage device */ + img = open(imgName, O_RDWR | O_CREAT | tr, 0644); + if (img == -1) { + ESYSERR(0); + if (fd > 2) + close(fd); + return 3; + } + } else { /* GET */ + /* open storage device */ + img = open(imgName, O_RDONLY); + if (img == -1) { + ESYSERR(0); + if (fd > 2) + close(fd); + return 3; + } else + iSize = lseek(img, 0, SEEK_END); + if (!imgSize) + imgSize = E_ALIGN(iSize, bufSize); + if (iSize == -1 || iSize > imgSize) { + if (fd > 2) + close(fd); + close(img); + EERROR(ENOSPC, "Error:: storage size %llu is " + "greater from file size %llu\n", + iSize, imgSize); + return 3; + } else + lseek(img, 0, SEEK_SET); } - if (EmptyStore(img) == -1) { - if (fd > 2) - close(fd); - close(img); - unlink(imgName); - return 3; - } - if (FillStore(img, fd) == -1) { - if (fd > 2) - close(fd); - close(img); - unlink(imgName); - return 4; + if (!m) { + if (EmptyStore(img) == -1) { + if (fd > 2) + close(fd); + close(img); + return 3; + } + if (FillStore(img, fd) == -1) { + if (fd > 2) + close(fd); + close(img); + return 4; + } + } else { /* GET */ + if (EmptyStore(fd) == -1) { + if (fd > 2) + close(fd); + close(img); + return 3; + } + if (FillStore(fd, img) == -1) { + if (fd > 2) + close(fd); + close(img); + return 4; + } } close(img); if (fd > 2) close(fd); + + if (R) + reboot(RB_AUTOBOOT); return 0; }