--- libaitsync/src/dir.c	2010/09/20 23:07:57	1.1.2.2
+++ libaitsync/src/dir.c	2011/05/09 14:35:56	1.1.2.6
@@ -3,9 +3,46 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: dir.c,v 1.1.2.2 2010/09/20 23:07:57 misho Exp $
+* $Id: dir.c,v 1.1.2.6 2011/05/09 14:35:56 misho Exp $
 *
-*************************************************************************/
+**************************************************************************
+The ELWIX and AITNET software is distributed under the following
+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
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #include "global.h"
 
 
@@ -111,7 +148,11 @@ create_diridx(const char *csDir, int lm, int *tags, st
 		if (lm & 1) {
 			if (lstat(d.d_name, &sb) != -1) {
 				memset(szStr, 0, STRSIZ);
+#if defined(__OpenBSD__)
 				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) {
 					case DT_FIFO:
 						strlcpy(szType, "fifo", STRSIZ);
@@ -134,15 +175,18 @@ create_diridx(const char *csDir, int lm, int *tags, st
 					case DT_SOCK:
 						strlcpy(szType, "socket", STRSIZ);
 						break;
+/* OpenBSD does not have this type */
+#ifdef DT_WHT
 					case DT_WHT:
 						strlcpy(szType, "wht", STRSIZ);
 						break;
+#endif
 					case DT_UNKNOWN:
 					default:
 						strlcpy(szType, "unknown", STRSIZ);
 						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, 
 						sb.st_mode & 0x1fff, sb.st_size, szStr);
 			}
@@ -320,8 +364,13 @@ sync_dircmpList(const char *csDir1, const char *csDir2
 				if (lm & 1) {
 					if (lstat(d.d_name, &sb) != -1) {
 						memset(szStr, 0, STRSIZ);
+#if defined(__OpenBSD__)
 						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) {
 							case DT_FIFO:
 								strlcpy(szType, "fifo", STRSIZ);
@@ -344,16 +393,19 @@ sync_dircmpList(const char *csDir1, const char *csDir2
 							case DT_SOCK:
 								strlcpy(szType, "socket", STRSIZ);
 								break;
+/* OpenBSD does not have this type */
+#ifdef DT_WHT
 							case DT_WHT:
 								strlcpy(szType, "wht", STRSIZ);
 								break;
+#endif
 							case DT_UNKNOWN:
 							default:
 								strlcpy(szType, "unknown", STRSIZ);
 								break;
 						}
 						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, 
 								sb.st_mode & 0x1fff, sb.st_size, szStr);
 					}