--- libaitsync/src/patch.c 2010/03/24 16:00:15 1.1 +++ libaitsync/src/patch.c 2014/02/04 16:39:00 1.4.6.1 @@ -1,8 +1,62 @@ +/************************************************************************* +* (C) 2010 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: patch.c,v 1.4.6.1 2014/02/04 16:39:00 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 - 2014 + 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" #include "patch.h" -int sync_buildPatch(void * __restrict buf, u_int buflen, struct tagPiece ** __restrict arr) +/* + * sync_buildPatch() - Build patch from buffer to pieces array + * + * @buf = Input buffer + * @buflen = Buffer length + * @arr = Array from pieces + * return: -1 error, != -1 num pieces +*/ +int +sync_buildPatch(void * __restrict buf, u_int buflen, struct tagPiece ** __restrict arr) { void *pos; sync_chunk_t *prefix, *suffix; @@ -15,7 +69,7 @@ int sync_buildPatch(void * __restrict buf, u_int bufle a = malloc(sizeof(struct tagPiece)); if (!a) { - SETERR; + LOGERR; return -1; } else memset(a, 0, sizeof(struct tagPiece)); @@ -23,13 +77,15 @@ int sync_buildPatch(void * __restrict buf, u_int bufle for (pos = buf, i = 0; len && pos < buf + buflen; i++) { a = realloc(a, sizeof(struct tagPiece) * (i + 2)); if (!a) { - SETERR; + LOGERR; return -1; } else { memset(&a[i + 1], 0, sizeof(struct tagPiece)); - // printf("%d.prefix_pos=%p len=%d\n", i, pos, len); +#if 0 + printf("start: %d.prefix_pos=%p len=%d\n", i, pos, len); +#endif - // prefix chunk + /* prefix chunk */ prefix = pos; if (prefix->sc_magic != DLTSYNC_MAGIC) { if (a) { @@ -42,9 +98,11 @@ int sync_buildPatch(void * __restrict buf, u_int bufle pos += sizeof(sync_chunk_t); len -= sizeof(sync_chunk_t); } - // printf("%d.prefix=%p pos=%p len=%d\n", i, a[i].pfx, pos, len); +#if 0 + printf("prefix: %d.prefix=%p pos=%p len=%d\n", i, a[i].pfx, pos, len); +#endif - // data + /* data */ if (!len) { if (a) { free(a); @@ -56,9 +114,11 @@ int sync_buildPatch(void * __restrict buf, u_int bufle pos += prefix->sc_len; len -= prefix->sc_len; } - // printf("%d.data=%p pos=%p len=%d\n", i, a[i].buf, pos, len); +#if 0 + printf("data: %d.data=%p pos=%p len=%d\n", i, a[i].buf, pos, len); +#endif - // if find sync chunk + /* if find sync chunk */ if (len) { suffix = pos; if (SIGSYNC_MAGIC == suffix->sc_magic) { @@ -66,7 +126,9 @@ int sync_buildPatch(void * __restrict buf, u_int bufle pos += sizeof(sync_chunk_t); len -= sizeof(sync_chunk_t); } - // printf("%d.data=%p pos=%p len=%d\n", i, a[i].sfx, pos, len); +#if 0 + printf("suffix: %d.data=%p pos=%p len=%d\n", i, a[i].sfx, pos, len); +#endif } } }