embedtools/src/imgupd.c - diff

Return to imgupd.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedtools / src

Diff for /embedtools/src/imgupd.c between versions 1.5.2.1 and 1.6.2.2

version 1.5.2.1, 2014/02/05 23:31:26	version 1.6.2.2, 2014/02/06 00:16:05
Line 47 SUCH DAMAGE.	Line 47 SUCH DAMAGE.


char imgName[PATH_MAX], imgFile[PATH_MAX];	char imgName[PATH_MAX], imgFile[PATH_MAX];
off_t imgSize, iSize;	off_t imgSize, iSize, fromBegin;
int Verbose, bufSize = IMGBUF_SIZE;	int Verbose, bufSize = IMGBUF_SIZE;
extern char compiled[], compiledby[], compilehost[];	extern char compiled[], compiledby[], compilehost[];

Line 61 Usage()	Line 61 Usage()
"\t-v\t\tVerbose ...\n"	"\t-v\t\tVerbose ...\n"
"\t-R\t\tReboot system after complete\n"	"\t-R\t\tReboot system after complete\n"
"\t-p\t\tPipe suitable transfer on little chunks\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-g\t\tGet image from Storage\n"
"\t-t\t\tTruncate Storage file name\n"	"\t-t\t\tTruncate Storage file name\n"
"\t-s <size>\tStorage size (required for stdin)\n"	"\t-s <size>\tStorage size (required for stdin)\n"
Line 77 EmptyStore(int img)	Line 78 EmptyStore(int img)

VERB(1) printf("Erase store %s\n", imgName);	VERB(1) printf("Erase store %s\n", imgName);

iSize = lseek(img, 0, SEEK_END);	if (!fromBegin) {
if (iSize == -1) {	iSize = lseek(img, 0, SEEK_END);
ESYSERR(0);	if (iSize == -1) {
return -1;	ESYSERR(0);
	return -1;
	} else
	imgSize += E_ALIGN(iSize, bufSize);
} else	} else
imgSize += E_ALIGN(iSize, bufSize);	iSize ^= iSize;

memset(buf, 0, sizeof buf);	memset(buf, 0, sizeof buf);
for (i = howmany(iSize, bufSize); i < howmany(imgSize, bufSize); i++)	for (i = howmany(iSize, bufSize); i < howmany(imgSize, bufSize); i++)
Line 139 main(int argc, char **argv)	Line 143 main(int argc, char **argv)
char ch, m = 0, R = 0;	char ch, m = 0, R = 0;
int fd, img, tr = 0;	int fd, img, tr = 0;

while ((ch = getopt(argc, argv, "hvRpgts:f:")) != -1)	while ((ch = getopt(argc, argv, "hvRipgts:f:")) != -1)
switch (ch) {	switch (ch) {
case 'f':	case 'f':
strlcpy(imgName, optarg, sizeof imgName);	strlcpy(imgName, optarg, sizeof imgName);
Line 154 main(int argc, char **argv)	Line 158 main(int argc, char **argv)
case 't':	case 't':
tr = O_TRUNC;	tr = O_TRUNC;
break;	break;
case 'g':
m = 1;
break;
case 'p':	case 'p':
bufSize = IMGBUF_SIZE2;	bufSize = IMGBUF_SIZE2;
	break;
	case 'g':
	m = 1;
	case 'i':
	fromBegin = 1;
break;	break;
case 'R':	case 'R':
R = 1;	R = 1;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.5.2.1
changed lines
	Added in v.1.6.2.2