--- libaitsync/src/dir.c	2011/05/09 14:35:56	1.1.2.6
+++ libaitsync/src/dir.c	2012/11/13 10:30:44	1.3.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: dir.c,v 1.1.2.6 2011/05/09 14:35:56 misho Exp $
+* $Id: dir.c,v 1.3.2.1 2012/11/13 10:30:44 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -80,7 +80,7 @@ create_tags()
 
 	tags = calloc(TABLESIZ, sizeof(int));
 	if (!tags) {
-		SETERR;
+		LOGERR;
 	} else
 		memset(tags, -1, TABLESIZ * sizeof(int));
 
@@ -100,7 +100,7 @@ create_diridx(const char *csDir, int lm, int *tags, st
 
 	l = malloc(sizeof(struct tagDirName));
 	if (!l) {
-		SETERR;
+		LOGERR;
 		*list = NULL;
 		return -1;
 	} else {
@@ -110,7 +110,7 @@ create_diridx(const char *csDir, int lm, int *tags, st
 
 	old = getcwd(NULL, 0);
 	if (chdir(csDir) == -1) {
-		SETERR;
+		LOGERR;
 		free(old);
 		free(l);
 		*list = NULL;
@@ -118,7 +118,7 @@ create_diridx(const char *csDir, int lm, int *tags, st
 	}
 	dir = opendir(".");
 	if (!dir) {
-		SETERR;
+		LOGERR;
 		chdir(old);
 		free(old);
 		free(l);
@@ -131,7 +131,7 @@ create_diridx(const char *csDir, int lm, int *tags, st
 
 		l = realloc(l, sizeof(struct tagDirName) * (n + 2));
 		if (!l) {
-			SETERR;
+			LOGERR;
 			chdir(old);
 			free(old);
 			free(l);
@@ -186,9 +186,9 @@ create_diridx(const char *csDir, int lm, int *tags, st
 						strlcpy(szType, "unknown", STRSIZ);
 						break;
 				}
-				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, 
-						sb.st_mode & 0x1fff, sb.st_size, szStr);
+				snprintf(l[n].extra, STRSIZ, "%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, (long) sb.st_size, szStr);
 			}
 		}
 
@@ -225,14 +225,14 @@ sync_dirCSum(const char *csDir, u_char **md)
 
 	*md = malloc(MD5_DIGEST_LENGTH);
 	if (!*md) {
-		SETERR;
+		LOGERR;
 		return -1;
 	} else
 		memset(*md, 0, MD5_DIGEST_LENGTH);
 
 	dir = opendir(csDir);
 	if (!dir) {
-		SETERR;
+		LOGERR;
 		free(*md);
 		return -1;
 	}
@@ -315,14 +315,14 @@ sync_dircmpList(const char *csDir1, const char *csDir2
 	}
 
 	if (lstat(csDir2, &sb) == -1) {
-		SETERR;
+		LOGERR;
 		free(l);
 		return -1;
 	}
 	if (S_ISDIR(sb.st_mode)) {
 		old = getcwd(NULL, 0);
 		if (chdir(csDir2) == -1) {
-			SETERR;
+			LOGERR;
 			chdir(old);
 			free(old);
 			free(l);
@@ -330,7 +330,7 @@ sync_dircmpList(const char *csDir1, const char *csDir2
 		}
 		dir = opendir(".");
 		if (!dir) {
-			SETERR;
+			LOGERR;
 			chdir(old);
 			free(old);
 			free(l);
@@ -349,7 +349,7 @@ sync_dircmpList(const char *csDir1, const char *csDir2
 			if (!find) {
 				l = realloc(l, sizeof(struct tagDirName) * (n + 2));
 				if (!l) {
-					SETERR;
+					LOGERR;
 					chdir(old);
 					free(old);
 					closedir(dir);
@@ -405,9 +405,10 @@ sync_dircmpList(const char *csDir1, const char *csDir2
 								break;
 						}
 						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, 
-								sb.st_mode & 0x1fff, sb.st_size, szStr);
+								"%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, (long) sb.st_size, 
+								szStr);
 					}
 				}
 
@@ -421,7 +422,7 @@ sync_dircmpList(const char *csDir1, const char *csDir2
 		if (strcmp(csDir2, "-")) {
 			f = fopen(csDir2, "r");
 			if (!f) {
-				SETERR;
+				LOGERR;
 				free(l);
 				return -1;
 			}
@@ -447,7 +448,7 @@ sync_dircmpList(const char *csDir1, const char *csDir2
 			if (!find) {
 				l = realloc(l, sizeof(struct tagDirName) * (n + 2));
 				if (!l) {
-					SETERR;
+					LOGERR;
 					if (strcmp(csDir2, "-"))
 						fclose(f);
 					return -1;