--- embedtools/src/direr.c 2011/06/08 12:45:41 1.2 +++ embedtools/src/direr.c 2013/01/18 13:21:06 1.3.4.2 @@ -3,9 +3,46 @@ * by Michael Pounov * * $Author: misho $ - * $Id: direr.c,v 1.2 2011/06/08 12:45:41 misho Exp $ + * $Id: direr.c,v 1.3.4.2 2013/01/18 13:21:06 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, 2012, 2013 + 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" @@ -27,6 +64,7 @@ main(int argc, char **argv) u_char *md[2], mode = 0; char szCmp[MAXPATHLEN], *str[2], ch; int ret = 0; + ait_val_t v; memset(md, 0, sizeof md); memset(str, 0, sizeof str); @@ -54,11 +92,13 @@ main(int argc, char **argv) mode |= 2; } - if (sync_dirCSum(argv[0], &md[0]) == -1) { + if (sync_dirChkSum(argv[0], &md[0]) == -1) { printf("Error:: %s(%d) #%d - %s\n", __func__, __LINE__, errno, strerror(errno)); return 1; } - str[0] = io_Hex2Ch(md[0], MD5_DIGEST_LENGTH); + AIT_SET_BUF(&v, md[0], MD5_DIGEST_LENGTH); + str[0] = str_Dig2Hex(&v); + AIT_FREE_VAL(&v); if (!str[0]) { free(md[0]); return 1; @@ -72,11 +112,13 @@ main(int argc, char **argv) } if (mode & 2 && *szCmp) { - if (sync_dirCSum(szCmp, &md[1]) == -1) { + if (sync_dirChkSum(szCmp, &md[1]) == -1) { printf("Error:: %s(%d) #%d - %s\n", __func__, __LINE__, errno, strerror(errno)); return 1; } - str[1] = io_Hex2Ch(md[1], MD5_DIGEST_LENGTH); + AIT_SET_BUF(&v, md[1], MD5_DIGEST_LENGTH); + str[1] = str_Dig2Hex(&v); + AIT_FREE_VAL(&v); if (!str[1]) { free(md[0]); free(str[0]);