--- libaitio/src/aitio.c 2011/02/10 19:34:53 1.2.2.1 +++ libaitio/src/aitio.c 2011/04/20 22:55:41 1.4.2.2 @@ -1,11 +1,48 @@ /************************************************************************* -* (C) 2010 AITNET ltd - Sofia/Bulgaria - -* by Michael Pounov +* (C) 2010 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov * * $Author: misho $ -* $Id: aitio.c,v 1.2.2.1 2011/02/10 19:34:53 misho Exp $ +* $Id: aitio.c,v 1.4.2.2 2011/04/20 22:55:41 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" @@ -306,7 +343,56 @@ char *ioRegexReplace(const char *csRegex, const char * return str; } +/* + * ioVarAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}" + * @csString = Input string + * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free() +*/ +char * +ioVarAst(const char *csString) +{ + char *ext, *str, *out = NULL; + int e[2] = { 0 }; + if (!csString) + return NULL; + + if (!strchr(csString, '{') || !strrchr(csString, '}')) { + memset(io_Error, 0, STRSIZ); + snprintf(io_Error, STRSIZ, "Error:: Invalid input string format ... " + "must be like {text[:[-]#[:#]]}"); + io_Errno = EINVAL; + return NULL; + } else { + str = strdup(strchr(csString, '{') + 1); + *strrchr(str, '}') = 0; + } + + if ((ext = strchr(str, ':'))) { + *ext++ = 0; + e[0] = strtol(ext, NULL, 0); + if ((ext = strchr(ext, ':'))) + e[1] = strtol(++ext, NULL, 0); + + /* make cut prefix */ + if (e[0] >= 0) + ext = str + e[0]; + else + ext = str + strlen(str) + e[0]; + /* make cut suffix */ + if (e[1] > 0) + *(ext + e[1]) = 0; + } else + /* ok, clear show */ + ext = str; + + out = strdup(ext); + free(str); + + return out; +} + + /* * ioMkDir() Function for racursive directory creation and validation * @csDir = Full directory path @@ -354,49 +440,113 @@ end: return cx; } - /* - * ioVarAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}" - * @csString = Input string - * @strLen = String length - * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free() + * ioWatchDirLoop() Function for watching changes in directory and fire callback + * @csDir = Full directory path + * @callback = Callback if raise event! nOp -1 delete, 0 change/move, 1 create + * return: -1 error, !=-1 ok, number of total signaled events */ -char * -ioVarAst(const char *csString, int strLen) +int +ioWatchDirLoop(const char *csDir, int (*callback)(const char *csName, int nOp)) { - char *ext, *str, *out = NULL; - int e[2] = { 0 }; + glob_t g[2] = {{ 0 }, { 0 }}; + int d, kq, n = 0; + register int j, i; + struct kevent req, chg; + char wrk[MAXPATHLEN * 2], str[MAXPATHLEN] = { 0 }; - if (!csString || !strLen) - return NULL; + if (!csDir || !callback) + return 0; - if (!strchr(csString, '{') || !strrchr(csString, '}')) - return NULL; - else { - str = strdup(strchr(csString, '{') + 1); - *strrchr(str, '}') = 0; + strlcpy(str, csDir, MAXPATHLEN); + strlcat(str, "/*", MAXPATHLEN); + + kq = kqueue(); + if (kq == -1) { + LOGERR; + return -1; } + d = open(csDir, O_RDONLY); + if (d == -1) { + LOGERR; + close(kq); + return -1; + } - if ((ext = strchr(str, ':'))) { - *ext++ = 0; - e[0] = strtol(ext, NULL, 0); - if ((ext = strchr(ext, ':'))) - e[1] = strtol(++ext, NULL, 0); + EV_SET(&req, d, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE, 0, 0); - /* make cut prefix */ - if (e[0] >= 0) - ext = str + e[0]; - else - ext = str + strlen(str) + e[0]; - /* make cut suffix */ - if (e[1] > 0) - *(ext + e[1]) = 0; - } else - /* ok, clear show */ - ext = str; + if ((n = glob(str, GLOB_NOCHECK, NULL, &g[0]))) { + LOGERR; + close(d); + close(kq); + return -1; + } /*else + ioDEBUG(3, "Start files %d in %s\n", g[0].gl_matchc, str);*/ - out = strdup(ext); - free(str); + while (kevent(kq, &req, 1, &chg, 1, NULL) > 0) { + /*ioDEBUG(1, "Event:: req=0x%x -> chg=0x%x data=%x\n", req.fflags, chg.fflags, chg.data);*/ - return out; + if (!glob(str, GLOB_NOCHECK, NULL, &g[1])) { + /*ioDEBUG(3, "Diffs %d <> %d\n", g[0].gl_matchc, g[1].gl_matchc);*/ + + if (g[0].gl_matchc != g[1].gl_matchc) { + /* find new items */ + for (j = 0; j < g[1].gl_matchc; j++) { + for (i = 0; i < g[0].gl_matchc; i++) + if (!strcmp(g[0].gl_pathv[i], g[1].gl_pathv[j])) + break; + if (i == g[0].gl_matchc) { + if (callback(g[1].gl_pathv[j], 1) < 0) + break; + else + n++; + } + } + /* find del items */ + for (j = 0; j < g[0].gl_matchc; j++) { + for (i = 0; i < g[1].gl_matchc; i++) + if (!strcmp(g[1].gl_pathv[i], g[0].gl_pathv[j])) + break; + if (i == g[1].gl_matchc) { + if (callback(g[0].gl_pathv[j], -1) < 0) + break; + else + n++; + } + } + } else { + /* find chg from items */ + for (j = 0; j < g[0].gl_matchc; j++) { + for (i = 0; i < g[1].gl_matchc; i++) + if (!strcmp(g[1].gl_pathv[i], g[0].gl_pathv[j])) + break; + if (i == g[1].gl_matchc) { + strlcpy(wrk, g[0].gl_pathv[j], sizeof wrk); + strlcat(wrk, ":", sizeof wrk); + } + } + /* find chg to items */ + for (j = 0; j < g[1].gl_matchc; j++) { + for (i = 0; i < g[0].gl_matchc; i++) + if (!strcmp(g[0].gl_pathv[i], g[1].gl_pathv[j])) + break; + if (i == g[0].gl_matchc) { + strlcat(wrk, g[1].gl_pathv[j], sizeof wrk); + if (callback(wrk, 0) < 0) + break; + else + n++; + } + } + } + + globfree(&g[0]); + g[0] = g[1]; + } + } + + globfree(&g[0]); + close(d); + close(kq); + return n; }