libaitsync/src/dir.c - diff

Return to dir.c CVS log

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

Diff for /libaitsync/src/dir.c between versions 1.1.2.2 and 1.1.2.5

version 1.1.2.2, 2010/09/20 23:07:57	version 1.1.2.5, 2011/05/08 00:49:45
Line 111 create_diridx(const char csDir, int lm, int tags, st	Line 111 create_diridx(const char csDir, int lm, int tags, st
if (lm & 1) {	if (lm & 1) {
if (lstat(d.d_name, &sb) != -1) {	if (lstat(d.d_name, &sb) != -1) {
memset(szStr, 0, STRSIZ);	memset(szStr, 0, STRSIZ);
	#if defined(__OpenBSD__)
strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S", localtime((time_t*) &sb.st_mtim));	strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S", localtime((time_t*) &sb.st_mtim));
	#else
	strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S", localtime((time_t*) &sb.st_mtime));
	#endif
switch (d.d_type) {	switch (d.d_type) {
case DT_FIFO:	case DT_FIFO:
strlcpy(szType, "fifo", STRSIZ);	strlcpy(szType, "fifo", STRSIZ);
Line 134 create_diridx(const char csDir, int lm, int tags, st	Line 138 create_diridx(const char csDir, int lm, int tags, st
case DT_SOCK:	case DT_SOCK:
strlcpy(szType, "socket", STRSIZ);	strlcpy(szType, "socket", STRSIZ);
break;	break;
	/* OpenBSD does not have this type */
	#ifdef DT_WHT
case DT_WHT:	case DT_WHT:
strlcpy(szType, "wht", STRSIZ);	strlcpy(szType, "wht", STRSIZ);
break;	break;
	#endif
case DT_UNKNOWN:	case DT_UNKNOWN:
default:	default:
strlcpy(szType, "unknown", STRSIZ);	strlcpy(szType, "unknown", STRSIZ);
break;	break;
}	}
snprintf(l[n].extra, STRSIZ, "%s links=%d inode=%u %d:%d perm=0%o size=%llu %s",	snprintf(l[n].extra, STRSIZ, "%s links=%d inode=%lu %d:%d perm=0%o size=%ld %s",
szType, sb.st_nlink, sb.st_ino, sb.st_uid, sb.st_gid,	szType, sb.st_nlink, sb.st_ino, sb.st_uid, sb.st_gid,
sb.st_mode & 0x1fff, sb.st_size, szStr);	sb.st_mode & 0x1fff, sb.st_size, szStr);
}	}
Line 320 sync_dircmpList(const char csDir1, const char csDir2	Line 327 sync_dircmpList(const char csDir1, const char csDir2
if (lm & 1) {	if (lm & 1) {
if (lstat(d.d_name, &sb) != -1) {	if (lstat(d.d_name, &sb) != -1) {
memset(szStr, 0, STRSIZ);	memset(szStr, 0, STRSIZ);
	#if defined(__OpenBSD__)
strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S",	strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S",
localtime((time_t*) &sb.st_mtim));	localtime((time_t*) &sb.st_mtim));
	#else
	strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S",
	localtime((time_t*) &sb.st_mtime));
	#endif
switch (d.d_type) {	switch (d.d_type) {
case DT_FIFO:	case DT_FIFO:
strlcpy(szType, "fifo", STRSIZ);	strlcpy(szType, "fifo", STRSIZ);
Line 344 sync_dircmpList(const char csDir1, const char csDir2	Line 356 sync_dircmpList(const char csDir1, const char csDir2
case DT_SOCK:	case DT_SOCK:
strlcpy(szType, "socket", STRSIZ);	strlcpy(szType, "socket", STRSIZ);
break;	break;
	/* OpenBSD does not have this type */
	#ifdef DT_WHT
case DT_WHT:	case DT_WHT:
strlcpy(szType, "wht", STRSIZ);	strlcpy(szType, "wht", STRSIZ);
break;	break;
	#endif
case DT_UNKNOWN:	case DT_UNKNOWN:
default:	default:
strlcpy(szType, "unknown", STRSIZ);	strlcpy(szType, "unknown", STRSIZ);
break;	break;
}	}
snprintf(l[n].extra, STRSIZ,	snprintf(l[n].extra, STRSIZ,
"%s links=%d inode=%u %d:%d perm=0%o size=%llu %s",	"%s links=%d inode=%lu %d:%d perm=0%o size=%ld %s",
szType, sb.st_nlink, sb.st_ino, sb.st_uid, sb.st_gid,	szType, sb.st_nlink, sb.st_ino, sb.st_uid, sb.st_gid,
sb.st_mode & 0x1fff, sb.st_size, szStr);	sb.st_mode & 0x1fff, sb.st_size, szStr);
}	}

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

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