--- libaitsync/src/dir.c 2010/07/13 15:04:43 1.1.2.1 +++ libaitsync/src/dir.c 2011/05/09 15:04:38 1.2.2.2 @@ -3,9 +3,46 @@ * by Michael Pounov * * $Author: misho $ -* $Id: dir.c,v 1.1.2.1 2010/07/13 15:04:43 misho Exp $ +* $Id: dir.c,v 1.2.2.2 2011/05/09 15:04:38 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 + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + by Michael Pounov . 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 +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" @@ -57,7 +94,7 @@ create_diridx(const char *csDir, int lm, int *tags, st DIR *dir; struct dirent d, *pd; int n; - char szStr[STRSIZ], szType[STRSIZ]; + char szStr[STRSIZ], szType[STRSIZ], *old; struct stat sb; register int i; @@ -71,8 +108,10 @@ create_diridx(const char *csDir, int lm, int *tags, st memset(l, 0, sizeof(struct tagDirName)); } + old = getcwd(NULL, 0); if (chdir(csDir) == -1) { SETERR; + free(old); free(l); *list = NULL; return -1; @@ -80,6 +119,8 @@ create_diridx(const char *csDir, int lm, int *tags, st dir = opendir("."); if (!dir) { SETERR; + chdir(old); + free(old); free(l); *list = NULL; return -1; @@ -91,6 +132,8 @@ create_diridx(const char *csDir, int lm, int *tags, st l = realloc(l, sizeof(struct tagDirName) * (n + 2)); if (!l) { SETERR; + chdir(old); + free(old); free(l); *list = NULL; closedir(dir); @@ -105,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); @@ -128,17 +175,20 @@ 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", - 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); } } @@ -150,6 +200,9 @@ create_diridx(const char *csDir, int lm, int *tags, st for (i = n - 1; i > -1; i--) tags[l[i].tag] = i; + chdir(old); + free(old); + *list = l; return n; } @@ -250,7 +303,7 @@ sync_dircmpList(const char *csDir1, const char *csDir2 u_short t; u_int hash; struct stat sb; - char szLine[STRSIZ], szStr[STRSIZ], szType[STRSIZ], *str, *pbrk; + char szLine[STRSIZ], szStr[STRSIZ], szType[STRSIZ], *str, *pbrk, *old; if (!csDir1 || !list || !(tags = create_tags())) return -1; @@ -261,15 +314,25 @@ sync_dircmpList(const char *csDir1, const char *csDir2 return n; } - if (!lstat(csDir2, &sb) && S_ISDIR(sb.st_mode)) { + if (lstat(csDir2, &sb) == -1) { + SETERR; + free(l); + return -1; + } + if (S_ISDIR(sb.st_mode)) { + old = getcwd(NULL, 0); if (chdir(csDir2) == -1) { SETERR; + chdir(old); + free(old); free(l); return -1; } dir = opendir("."); if (!dir) { SETERR; + chdir(old); + free(old); free(l); return -1; } @@ -287,6 +350,8 @@ sync_dircmpList(const char *csDir1, const char *csDir2 l = realloc(l, sizeof(struct tagDirName) * (n + 2)); if (!l) { SETERR; + chdir(old); + free(old); closedir(dir); return -1; } else @@ -299,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); @@ -323,18 +393,22 @@ 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", - 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); } } @@ -342,6 +416,8 @@ sync_dircmpList(const char *csDir1, const char *csDir2 } } closedir(dir); + chdir(old); + free(old); } else { if (strcmp(csDir2, "-")) { f = fopen(csDir2, "r");