[BACK]Return to aitio.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitio / src

Diff for /libaitio/src/aitio.c between versions 1.3 and 1.6

version 1.3, 2011/02/10 22:01:34 version 1.6, 2011/06/07 11:49:39
Line 1 Line 1
 /*************************************************************************  /*************************************************************************
* (C) 2010 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>* (C) 2010 AITNET ltd - Sofia/Bulgaria - <misho@aitnet.org>
*  by Michael Pounov <misho@openbsd-bg.org>*  by Michael Pounov <misho@elwix.org>
 *  *
 * $Author$  * $Author$
 * $Id$  * $Id$
 *  *
*************************************************************************/**************************************************************************
 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 <info@elwix.org>
 
 Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
         by Michael Pounov <misho@elwix.org>.  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 <misho@elwix.org>
 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 "global.h"
   
   
Line 21  char io_Error[STRSIZ]; Line 58  char io_Error[STRSIZ];
   
   
 // io_GetErrno() Get error code of last operation  // io_GetErrno() Get error code of last operation
inline int io_GetErrno()inline int
 io_GetErrno()
 {  {
         return io_Errno;          return io_Errno;
 }  }
   
 // io_GetError() Get error text of last operation  // io_GetError() Get error text of last operation
inline const char *io_GetError()inline const char *
 io_GetError()
 {  {
         return io_Error;          return io_Error;
 }  }
   
 // io_SetErr() Set error to variables for internal use!!!  // io_SetErr() Set error to variables for internal use!!!
inline void io_SetErr(int eno, char *estr, ...)inline void
 io_SetErr(int eno, char *estr, ...)
 {  {
         va_list lst;          va_list lst;
   
Line 53  inline void io_SetErr(int eno, char *estr, ...) Line 93  inline void io_SetErr(int eno, char *estr, ...)
  * @dataLen = Length of data   * @dataLen = Length of data
  * return: 0 EOF; -1 error:: can`t read; >0 count of readed chars   * return: 0 EOF; -1 error:: can`t read; >0 count of readed chars
 */  */
int ioPromptRead(int *h, const char *csPrompt, char * __restrict psData, int dataLen)int
 ioPromptRead(int *h, const char *csPrompt, char * __restrict psData, int dataLen)
 {  {
         int ok = 0;          int ok = 0;
         FILE *inp, *out;          FILE *inp, *out;
Line 106  int ioPromptRead(int *h, const char *csPrompt, char *  Line 147  int ioPromptRead(int *h, const char *csPrompt, char * 
  * @confirm = Confirm password, 0 - get password, !=0 Ask for confirmation   * @confirm = Confirm password, 0 - get password, !=0 Ask for confirmation
  * return: 0 EOF; -1 error:: can`t read; >0 count of readed chars   * return: 0 EOF; -1 error:: can`t read; >0 count of readed chars
 */  */
int ioPromptPassword(int *h, const char *csPrompt, char * __restrict psPass, int passLen, int confirm)int
 ioPromptPassword(int *h, const char *csPrompt, char * __restrict psPass, int passLen, int confirm)
 {  {
         int ret, ok = 0;          int ret, ok = 0;
         FILE *inp, *out;          FILE *inp, *out;
Line 190  next: Line 232  next:
  * @endPos = Return end positions   * @endPos = Return end positions
  * return: NULL not match or error; !=NULL begin of matched data   * return: NULL not match or error; !=NULL begin of matched data
 */  */
const char *ioRegexVerify(const char *csRegex, const char *csData, int *startPos, int *endPos)const char *
 ioRegexVerify(const char *csRegex, const char *csData, int *startPos, int *endPos)
 {  {
         regex_t re;          regex_t re;
         regmatch_t match;          regmatch_t match;
Line 237  const char *ioRegexVerify(const char *csRegex, const c Line 280  const char *ioRegexVerify(const char *csRegex, const c
  * @strLen = Length of string   * @strLen = Length of string
  * return: 0 not match; >0 count of returned chars   * return: 0 not match; >0 count of returned chars
 */  */
int ioRegexGet(const char *csRegex, const char *csData, char * __restrict psString, int strLen)int
 ioRegexGet(const char *csRegex, const char *csData, char * __restrict psString, int strLen)
 {  {
         int sp, ep, len;          int sp, ep, len;
         const char *str;          const char *str;
Line 265  int ioRegexGet(const char *csRegex, const char *csData Line 309  int ioRegexGet(const char *csRegex, const char *csData
  * @csNew = Data for replace   * @csNew = Data for replace
  * return: NULL not match or error; !=NULL allocated new string, must be free after use!   * return: NULL not match or error; !=NULL allocated new string, must be free after use!
 */  */
char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew)char *
 ioRegexReplace(const char *csRegex, const char *csData, const char *csNew)
 {  {
         int sp, ep, len;          int sp, ep, len;
         char *str = NULL;          char *str = NULL;
Line 436  ioWatchDirLoop(const char *csDir, int (*callback)(cons Line 481  ioWatchDirLoop(const char *csDir, int (*callback)(cons
                 return -1;                  return -1;
         }          }
   
        EV_SET(&req, d, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE, 0, NULL);        EV_SET(&req, d, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE, 0, 0);
   
         if ((n = glob(str, GLOB_NOCHECK, NULL, &g[0]))) {          if ((n = glob(str, GLOB_NOCHECK, NULL, &g[0]))) {
                 LOGERR;                  LOGERR;
Removed from v.1.3  
changed lines
  Added in v.1.6

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>