--- libaitsync/src/dir.c	2012/11/13 13:38:14	1.3.2.2
+++ libaitsync/src/dir.c	2012/11/13 13:53:14	1.3.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: dir.c,v 1.3.2.2 2012/11/13 13:38:14 misho Exp $
+* $Id: dir.c,v 1.3.2.3 2012/11/13 13:53:14 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -145,51 +145,51 @@ create_diridx(const char *csDir, int lm, int *tags, st
 		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);
-		strlcpy(l[n].name, d.d_name, MAXPATHLEN);
+		strlcpy(l[n].name, d.d_name, sizeof l[n].name);
 		if (lm & 1) {
 			if (lstat(d.d_name, &sb) != -1) {
-				memset(szStr, 0, STRSIZ);
+				memset(szStr, 0, sizeof szStr);
 #if defined(__OpenBSD__)
-				strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S", 
+				strftime(szStr, sizeof szStr, "%Y-%m-%d %H:%M:%S", 
 						localtime((time_t*) &sb.st_mtim));
 #else
-				strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S", 
+				strftime(szStr, sizeof szStr, "%Y-%m-%d %H:%M:%S", 
 						localtime((time_t*) &sb.st_mtime));
 #endif
 				switch (d.d_type) {
 					case DT_FIFO:
-						strlcpy(szType, "fifo", STRSIZ);
+						strlcpy(szType, "fifo", sizeof szType);
 						break;
 					case DT_CHR:
-						strlcpy(szType, "char", STRSIZ);
+						strlcpy(szType, "char", sizeof szType);
 						break;
 					case DT_DIR:
-						strlcpy(szType, "dir", STRSIZ);
+						strlcpy(szType, "dir", sizeof szType);
 						break;
 					case DT_BLK:
-						strlcpy(szType, "block", STRSIZ);
+						strlcpy(szType, "block", sizeof szType);
 						break;
 					case DT_REG:
-						strlcpy(szType, "file", STRSIZ);
+						strlcpy(szType, "file", sizeof szType);
 						break;
 					case DT_LNK:
-						strlcpy(szType, "link", STRSIZ);
+						strlcpy(szType, "link", sizeof szType);
 						break;
 					case DT_SOCK:
-						strlcpy(szType, "socket", STRSIZ);
+						strlcpy(szType, "socket", sizeof szType);
 						break;
 /* OpenBSD does not have this type */
 #ifdef DT_WHT
 					case DT_WHT:
-						strlcpy(szType, "wht", STRSIZ);
+						strlcpy(szType, "wht", sizeof szType);
 						break;
 #endif
 					case DT_UNKNOWN:
 					default:
-						strlcpy(szType, "unknown", STRSIZ);
+						strlcpy(szType, "unknown", sizeof szType);
 						break;
 				}
-				snprintf(l[n].extra, STRSIZ, 
+				snprintf(l[n].extra, sizeof l[n].extra, 
 						"%s links=%d inode=%ld %d:%d perm=0%o size=%ld %s", 
 						szType, sb.st_nlink, (long) sb.st_ino, 
 						sb.st_uid, sb.st_gid, sb.st_mode & 0x1fff, 
@@ -368,51 +368,51 @@ sync_dircmpList(const char *csDir1, const char *csDir2
 				l[n].ch = '>';
 				l[n].tag = t;
 				l[n].hash = hash;
-				strlcpy(l[n].name, d.d_name, MAXPATHLEN);
+				strlcpy(l[n].name, d.d_name, sizeof l[n].name);
 				if (lm & 1) {
 					if (lstat(d.d_name, &sb) != -1) {
-						memset(szStr, 0, STRSIZ);
+						memset(szStr, 0, sizeof szStr);
 #if defined(__OpenBSD__)
-						strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S", 
+						strftime(szStr, sizeof szStr, "%Y-%m-%d %H:%M:%S", 
 								localtime((time_t*) &sb.st_mtim));
 #else
-						strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S", 
+						strftime(szStr, sizeof szStr, "%Y-%m-%d %H:%M:%S", 
 								localtime((time_t*) &sb.st_mtime));
 #endif
 						switch (d.d_type) {
 							case DT_FIFO:
-								strlcpy(szType, "fifo", STRSIZ);
+								strlcpy(szType, "fifo", sizeof szType);
 								break;
 							case DT_CHR:
-								strlcpy(szType, "char", STRSIZ);
+								strlcpy(szType, "char", sizeof szType);
 								break;
 							case DT_DIR:
-								strlcpy(szType, "dir", STRSIZ);
+								strlcpy(szType, "dir", sizeof szType);
 								break;
 							case DT_BLK:
-								strlcpy(szType, "block", STRSIZ);
+								strlcpy(szType, "block", sizeof szType);
 								break;
 							case DT_REG:
-								strlcpy(szType, "file", STRSIZ);
+								strlcpy(szType, "file", sizeof szType);
 								break;
 							case DT_LNK:
-								strlcpy(szType, "link", STRSIZ);
+								strlcpy(szType, "link", sizeof szType);
 								break;
 							case DT_SOCK:
-								strlcpy(szType, "socket", STRSIZ);
+								strlcpy(szType, "socket", sizeof szType);
 								break;
 /* OpenBSD does not have this type */
 #ifdef DT_WHT
 							case DT_WHT:
-								strlcpy(szType, "wht", STRSIZ);
+								strlcpy(szType, "wht", sizeof szType);
 								break;
 #endif
 							case DT_UNKNOWN:
 							default:
-								strlcpy(szType, "unknown", STRSIZ);
+								strlcpy(szType, "unknown", sizeof szType);
 								break;
 						}
-						snprintf(l[n].extra, STRSIZ, 
+						snprintf(l[n].extra, sizeof l[n].extra, 
 								"%s links=%d inode=%ld %d:%d perm=0%o "
 								"size=%ld %s", szType, sb.st_nlink, 
 								(long) sb.st_ino, sb.st_uid, sb.st_gid, 
@@ -436,7 +436,7 @@ sync_dircmpList(const char *csDir1, const char *csDir2
 				return -1;
 			}
 		}
-		while (fgets(szLine, STRSIZ, f)) {
+		while (fgets(szLine, sizeof szLine, f)) {
 			if (!*szLine || *szLine == '#')
 				continue;
 
@@ -467,9 +467,9 @@ sync_dircmpList(const char *csDir1, const char *csDir2
 				l[n].ch = '>';
 				l[n].tag = t;
 				l[n].hash = hash;
-				strlcpy(l[n].name, str, MAXPATHLEN);
+				strlcpy(l[n].name, str, sizeof l[n].name);
 				if (lm & 1 && (str = strtok_r(NULL, "\r\n", &pbrk)))
-					strlcpy(l[n].extra, str, STRSIZ);
+					strlcpy(l[n].extra, str, sizeof l[n].extra);
 
 				n++;
 			}