embedtools/src/dircmp.c - diff

Return to dircmp.c CVS log

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

Diff for /embedtools/src/dircmp.c between versions 1.1.2.1 and 1.1.2.2

version 1.1.2.1, 2010/07/13 09:35:01	version 1.1.2.2, 2010/07/13 11:04:09
Line 3	Line 3


extern char compiled[], compiledby[], compilehost[];	extern char compiled[], compiledby[], compilehost[];
char l;	char lm;


static void	static void
Line 107 cmpDir(const char csDir1, const char csDir2, struct	Line 107 cmpDir(const char csDir1, const char csDir2, struct
l[n].tag = crcFletcher16((u_short*) d.d_name, d.d_namlen / 2 + d.d_namlen % 2);	l[n].tag = crcFletcher16((u_short*) d.d_name, d.d_namlen / 2 + d.d_namlen % 2);
l[n].hash = crcAdler((u_char*) d.d_name, d.d_namlen);	l[n].hash = crcAdler((u_char*) d.d_name, d.d_namlen);
strlcpy(l[n].name, d.d_name, MAXPATHLEN);	strlcpy(l[n].name, d.d_name, MAXPATHLEN);
if (l) {	if (lm) {
if (lstat(d.d_name, &sb) != -1) {	if (lstat(d.d_name, &sb) != -1) {
memset(szStr, 0, MAX_STR);	memset(szStr, 0, MAX_STR);
strftime(szStr, MAX_STR, "%y-%m-%d %H:%M:%S", localtime(&sb.st_mtim));	strftime(szStr, MAX_STR, "%y-%m-%d %H:%M:%S", localtime((time_t*) &sb.st_mtim));
switch (d.d_type) {	switch (d.d_type) {
case DT_FIFO:	case DT_FIFO:
strlcpy(szType, "fifo", MAX_STR);	strlcpy(szType, "fifo", MAX_STR);
Line 142 cmpDir(const char csDir1, const char csDir2, struct	Line 142 cmpDir(const char csDir1, const char csDir2, struct
break;	break;
}	}
snprintf(l[n].extra, MAX_STR, "%s links=%d %d:%d perm=0%o size=%llu %s\n", szType,	snprintf(l[n].extra, MAX_STR, "%s links=%d %d:%d perm=0%o size=%llu %s\n", szType,
sb.st_nlink, sb.st_uid, sb.st_gid, sb.st_mode, sb.st_size, szStr);	sb.st_nlink, sb.st_uid, sb.st_gid, sb.st_mode & 0x1fff,
	sb.st_size, szStr);
}	}
}	}

Line 194 cmpDir(const char csDir1, const char csDir2, struct	Line 195 cmpDir(const char csDir1, const char csDir2, struct
l[n].tag = t;	l[n].tag = t;
l[n].hash = hash;	l[n].hash = hash;
strlcpy(l[n].name, d.d_name, MAXPATHLEN);	strlcpy(l[n].name, d.d_name, MAXPATHLEN);
	if (lm) {
	if (lstat(d.d_name, &sb) != -1) {
	memset(szStr, 0, MAX_STR);
	strftime(szStr, MAX_STR, "%y-%m-%d %H:%M:%S", localtime((time_t*) &sb.st_mtim));
	switch (d.d_type) {
	case DT_FIFO:
	strlcpy(szType, "fifo", MAX_STR);
	break;
	case DT_CHR:
	strlcpy(szType, "char", MAX_STR);
	break;
	case DT_DIR:
	strlcpy(szType, "dir", MAX_STR);
	break;
	case DT_BLK:
	strlcpy(szType, "block", MAX_STR);
	break;
	case DT_REG:
	strlcpy(szType, "file", MAX_STR);
	break;
	case DT_LNK:
	strlcpy(szType, "link", MAX_STR);
	break;
	case DT_SOCK:
	strlcpy(szType, "socket", MAX_STR);
	break;
	case DT_WHT:
	strlcpy(szType, "wht", MAX_STR);
	break;
	case DT_UNKNOWN:
	default:
	strlcpy(szType, "unknown", MAX_STR);
	break;
	}
	snprintf(l[n].extra, MAX_STR, "%s links=%d %d:%d perm=0%o size=%llu %s\n", szType,
	sb.st_nlink, sb.st_uid, sb.st_gid, sb.st_mode & 0x1fff,
	sb.st_size, szStr);
	}
	}

n++;	n++;
}	}
Line 226 main(int argc, char **argv)	Line 266 main(int argc, char **argv)
while ((ch = getopt(argc, argv, "hl")) != -1)	while ((ch = getopt(argc, argv, "hl")) != -1)
switch (ch) {	switch (ch) {
case 'l':	case 'l':
l = 1;	lm = 1;
break;	break;
case 'h':	case 'h':
default:	default:

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

Removed from v.1.1.2.1
changed lines
	Added in v.1.1.2.2