--- libaitsync/src/aitsync.c 2011/05/09 14:36:33 1.2 +++ libaitsync/src/aitsync.c 2012/11/13 10:00:30 1.3.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsync.c,v 1.2 2011/05/09 14:36:33 misho Exp $ +* $Id: aitsync.c,v 1.3.2.1 2012/11/13 10:00:30 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 -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -54,29 +54,33 @@ static int sync_Errno; static char sync_Error[STRSIZ]; -static inline int func_comp(sync_tag_t const *t1, sync_tag_t const *t2) +static inline int +func_comp(sync_tag_t const *t1, sync_tag_t const *t2) { return t1->st_tag - t2->st_tag; } -// -// Error maintenance functions ... -// +/* + * Error maintenance functions ... + */ // sync_GetErrno() Get error code of last operation -inline int sync_GetErrno() +inline int +sync_GetErrno() { return sync_Errno; } // sync_GetError() Get error text of last operation -inline const char *sync_GetError() +inline const char * +sync_GetError() { return sync_Error; } // sync_SetErr() Set error to variables for internal use!!! -inline void syncSetErr(int eno, char *estr, ...) +inline void +syncSetErr(int eno, char *estr, ...) { va_list lst; @@ -87,16 +91,18 @@ inline void syncSetErr(int eno, char *estr, ...) va_end(lst); } -// ---------------------------------------------------------- +/* ---------------------------------------------------------- */ /* - * syncSignature() Calculate and create signature for diff - * @csInput = Input patched file name for calculating check sums + * syncSignature() - Calculate and create signature for diff + * + * @csInput = Input file name for calculating check sums * @csSig = Output Signature file name * @compress = 2 compress signatures output, 0 not compressed * return: -1 error, 0 ok */ -int syncSignature(const char *csInput, const char *csSig, int compress) +int +syncSignature(const char *csInput, const char *csSig, int compress) { int inf, outf, f, ret; u_char buf[CHUNK_MAX]; @@ -105,13 +111,13 @@ int syncSignature(const char *csInput, const char *csS sync_chunk_t sc; char szTemp[MAXPATHLEN]; - inf = syncOpen(csInput, O_RDONLY); + inf = syncOpen(csInput, O_RDONLY, 0); if (inf == -1) return inf; if (compress & 2) f = syncTemp(szTemp, MAXPATHLEN); else - f = syncOpen(csSig, O_WRONLY); + f = syncOpen(csSig, O_WRONLY, 0); if (f == -1) { syncClose(inf); return f; @@ -138,7 +144,7 @@ int syncSignature(const char *csInput, const char *csS // build compressed delta file if (compress & 2) { - outf = syncOpen(csSig, O_WRONLY); + outf = syncOpen(csSig, O_WRONLY, 0); if (outf == -1) { ret = outf; goto end; @@ -168,7 +174,8 @@ end: * @compress = 3 everything compress, 2 compressed signatures, 1 compress delta output, 0 not compressed * return: -1 error, 0 ok */ -int syncDelta(const char *csInput, const char *csSig, const char *csDelta, int compress) +int +syncDelta(const char *csInput, const char *csSig, const char *csDelta, int compress) { int inf, outf, f, sigf, ret, cnt; size_t blk; @@ -184,7 +191,7 @@ int syncDelta(const char *csInput, const char *csSig, /* load signatures */ if (compress & 2) { - f = syncOpen(csSig, O_RDONLY); + f = syncOpen(csSig, O_RDONLY, 0); if (-1 == f) return f; sigf = syncTemp(szTemp, MAXPATHLEN); @@ -201,7 +208,7 @@ int syncDelta(const char *csInput, const char *csSig, } else syncClose(f); } else { - sigf = syncOpen(csSig, O_RDONLY); + sigf = syncOpen(csSig, O_RDONLY, 0); if (-1 == sigf) return sigf; } @@ -268,7 +275,7 @@ int syncDelta(const char *csInput, const char *csSig, /* build delta patch */ - inf = syncOpen(csInput, O_RDONLY); + inf = syncOpen(csInput, O_RDONLY, 0); if (inf == -1) { free(tag_table); munmap(chunks, sb.st_size); @@ -277,7 +284,7 @@ int syncDelta(const char *csInput, const char *csSig, if (compress & 1) f = syncTemp(szTemp, MAXPATHLEN); else - f = syncOpen(csDelta, O_WRONLY); + f = syncOpen(csDelta, O_WRONLY, 0); if (f == -1) { syncClose(inf); free(tag_table); @@ -388,7 +395,7 @@ int syncDelta(const char *csInput, const char *csSig, // build compressed delta file if (compress & 1) { - outf = syncOpen(csDelta, O_WRONLY); + outf = syncOpen(csDelta, O_WRONLY, 0); if (outf == -1) { ret = outf; goto end; @@ -421,7 +428,8 @@ end: * @compress = 1 compress delta input, 0 not compressed * return: -1 error, 0 ok, create delta patch, 1 ok, no differences and not create patch */ -int syncPatch(const char *csInput, const char *csDelta, const char *csPatch, int compress) +int +syncPatch(const char *csInput, const char *csDelta, const char *csPatch, int compress) { int inf, outf, f, d, ret, readlen; char szTemp[MAXPATHLEN]; @@ -434,7 +442,7 @@ int syncPatch(const char *csInput, const char *csDelta sync_chunk_t sc, *suffix; if (compress & 1) { - f = syncOpen(csDelta, O_RDONLY); + f = syncOpen(csDelta, O_RDONLY, 0); if (f == -1) return f; d = syncTemp(szTemp, MAXPATHLEN); @@ -451,7 +459,7 @@ int syncPatch(const char *csInput, const char *csDelta } else syncClose(f); } else { - d = syncOpen(csDelta, O_RDONLY); + d = syncOpen(csDelta, O_RDONLY, 0); if (d == -1) return d; } @@ -482,14 +490,14 @@ int syncPatch(const char *csInput, const char *csDelta return -1; } - inf = syncOpen(csInput, O_RDONLY); + inf = syncOpen(csInput, O_RDONLY, 0); if (inf == -1) { if (pieces) free(pieces); munmap(delta, sb.st_size); return inf; } - outf = syncOpen(csPatch, O_WRONLY); + outf = syncOpen(csPatch, O_WRONLY, 0); if (outf == -1) { syncClose(inf); if (pieces)