--- libaitio/src/Attic/tools.c 2012/03/29 01:31:34 1.10 +++ libaitio/src/Attic/tools.c 2012/07/03 08:51:05 1.15 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: tools.c,v 1.10 2012/03/29 01:31:34 misho Exp $ +* $Id: tools.c,v 1.15 2012/07/03 08:51:05 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -48,56 +48,56 @@ SUCH DAMAGE. /* - * io_LTrimStr() Remove left whitespaces from text string + * io_LTrimStr() - Remove left whitespaces from text string * * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ inline int -io_LTrimStr(u_char * __restrict psLine) +io_LTrimStr(char * __restrict psLine) { int pos = 0; - u_char *s; + char *s; if (!psLine || !*psLine) return 0; - for (s = psLine; isspace(*s); s++); + for (s = psLine; isspace((u_char) *s); s++); pos = s - psLine; - memmove(psLine, s, (strlen((char*) psLine) - pos) + 1); + memmove(psLine, s, (strlen(psLine) - pos) + 1); return pos; } /* - * io_RTrimStr() Remove right whitespaces from text string + * io_RTrimStr() - Remove right whitespaces from text string * * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ inline int -io_RTrimStr(u_char * __restrict psLine) +io_RTrimStr(char * __restrict psLine) { - u_char *t, *pos; + char *t, *pos; if (!psLine || !*psLine) return 0; - pos = psLine + strlen((char*) psLine); - for (t = pos - 1; t > psLine && isspace(*t); t--); + pos = psLine + strlen(psLine); + for (t = pos - 1; t > psLine && isspace((u_char) *t); t--); *++t = 0; return pos - t; } /* - * io_TrimStr() Remove left and right whitespaces from text string + * io_TrimStr() - Remove left and right whitespaces from text string * * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ inline int -io_TrimStr(u_char * __restrict psLine) +io_TrimStr(char * __restrict psLine) { int ret = 0; @@ -108,13 +108,13 @@ io_TrimStr(u_char * __restrict psLine) } /* - * io_UnquotStr() Remove quots from input text string + * io_UnquotStr() - Remove quots from input text string * * @psLine = Text string * return: 0 nothing to do; 1 successful unquoted string */ inline int -io_UnquotStr(u_char * __restrict psLine) +io_UnquotStr(char * __restrict psLine) { char *pos, *str = NULL; int flg; @@ -122,31 +122,28 @@ io_UnquotStr(u_char * __restrict psLine) if (!psLine) return 0; - switch (*psLine) { - case '`': - case '"': - case '\'': - str = strdup((char*) psLine + 1); - for (pos = str, flg = 0; *pos; flg = ('\\' == *pos), pos++) { - if (!flg && *pos == *psLine) { - *pos = 0; - strlcpy((char*) psLine, str, strlen((char*) psLine) + 1); - break; - } + if (*psLine == '"' || *psLine == '\'') { + str = io_strdup(psLine + 1); + for (pos = str, flg = 0; *pos; flg = ('\\' == *pos), pos++) { + if (!flg && *pos == *psLine) { + *pos = 0; + strlcpy(psLine, str, strlen(psLine) + 1); + break; } - free(str); - return 1; + } + io_free(str); + return 1; } return 0; } /* - * io_Ch2Hex() Convert from Char string to Hex string + * io_Ch2Hex() - Convert from Char string to Hex string * * @psLine = Text string * @lineLen = Length of Text string - * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be free) + * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be io_free) */ inline u_char * io_Ch2Hex(u_char *psLine, int lineLen) @@ -158,7 +155,7 @@ io_Ch2Hex(u_char *psLine, int lineLen) if (!psLine || !*psLine || !lineLen) return NULL; - str = malloc(lineLen / 2); + str = io_malloc(lineLen / 2); if (!str) { LOGERR; return NULL; @@ -175,11 +172,11 @@ io_Ch2Hex(u_char *psLine, int lineLen) /* - * io_Hex2Ch() Convert from Hex string to Char string + * io_Hex2Ch() - Convert from Hex string to Char string * * @psLine = Text string * @lineLen = Length of Text string - * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free) + * return: NULL nothing to do or error; !=0 Allocated new converted string(must be io_free) */ inline char * io_Hex2Ch(u_char *psLine, int lineLen) @@ -190,7 +187,7 @@ io_Hex2Ch(u_char *psLine, int lineLen) if (!psLine || !*psLine || !lineLen) return NULL; - str = malloc(lineLen * 2 + 1); + str = io_malloc(lineLen * 2 + 1); if (!str) { LOGERR; return NULL; @@ -207,10 +204,10 @@ io_Hex2Ch(u_char *psLine, int lineLen) } /* - * io_CopyEnv() Copy environment to new environment array; + * io_CopyEnv() - Copy environment to new environment array; * * @oldenv = Environment array - * return: NULL error; !=NULL Allocated new environment array(must be free) + * return: NULL error; !=NULL Allocated new environment array(must be io_free) */ char ** io_CopyEnv(const char **oldenv) @@ -229,7 +226,7 @@ io_CopyEnv(const char **oldenv) num++; /* create and copy new environment */ - newenv = calloc(num + 1, sizeof(char*)); + newenv = io_calloc(num + 1, sizeof(char*)); if (!newenv) { LOGERR; return NULL; @@ -238,7 +235,7 @@ io_CopyEnv(const char **oldenv) for (i = 0; oldenv[i]; i++) if (*strchr(oldenv[i], '=')) { - *el = strdup(oldenv[i]); + *el = io_strdup(oldenv[i]); el++; } *el = NULL; @@ -247,11 +244,11 @@ io_CopyEnv(const char **oldenv) } /* - * io_ExecArgs() Build exec arguments from other array + * io_ExecArgs() - Build exec arguments from other array * * @psProg = Program name for execute * @oldarg = Arguments array - * return: NULL error; !=NULL Allocated execution array(must be free) + * return: NULL error; !=NULL Allocated execution array(must be io_free) */ char ** io_ExecArgs(const char *psProg, const char **oldarg) @@ -268,25 +265,25 @@ io_ExecArgs(const char *psProg, const char **oldarg) for (num = 0; oldarg[num]; num++); /* create and copy new arguments */ - newarg = calloc(num + 2, sizeof(char*)); + newarg = io_calloc(num + 2, sizeof(char*)); if (!newarg) { LOGERR; return NULL; } else el = newarg; - *el = strdup(psProg); + *el = io_strdup(psProg); el++; for (i = 0; oldarg[i]; i++, el++) - *el = strdup(oldarg[i]); + *el = io_strdup(oldarg[i]); *el = NULL; return newarg; } /* - * io_FreeNullTerm() Free dynamic allocated null terminated array with strings + * io_FreeNullTerm() - Free dynamic allocated null terminated array with strings * * @arr = Pointer to array for free * return: none @@ -299,8 +296,8 @@ io_FreeNullTerm(char *** __restrict arr) if (arr && *arr) { a = *arr; while (a && *a) - free(*a++); - free(*arr); + io_free(*a++); + io_free(*arr); *arr = NULL; } } @@ -326,7 +323,7 @@ io_Path2File(const char * __restrict csArgs, char * __ if (psPath && !pathLen) return -1; - psBuf = strdup(csArgs); + psBuf = io_strdup(csArgs); if (!psBuf) { LOGERR; return -1; @@ -336,7 +333,7 @@ io_Path2File(const char * __restrict csArgs, char * __ if (!pos) { strlcpy(psFile, psBuf, fileLen); - free(psBuf); + io_free(psBuf); return 1; } else *pos++ = 0; @@ -345,12 +342,12 @@ io_Path2File(const char * __restrict csArgs, char * __ if (psPath) strlcpy(psPath, psBuf, pathLen); - free(psBuf); + io_free(psBuf); return 2; } /* - * io_ether_ntoa() Convert ethernet address to string + * io_ether_ntoa() - Convert ethernet address to string * * @n = ethernet address structure, like struct ether_addr * @a = string @@ -374,7 +371,7 @@ io_ether_ntoa(const struct io_ether_addr *n, char * __ } /* - * io_ether_aton() Convert string to ethernet address + * io_ether_aton() - Convert string to ethernet address * * @a = string * @e = ethernet address structure, like struct ether_addr @@ -404,7 +401,7 @@ io_ether_aton(const char *a, struct io_ether_addr *e) } /* - * io_n2port() Extract port from network structure + * io_n2port() - Extract port from network structure * * @addr = Address * return: 0 not supported family type or port number @@ -423,8 +420,6 @@ io_n2port(io_sockaddr_t * __restrict addr) case AF_INET6: return ntohs(addr->sin6.sin6_port); default: - io_SetErr(ESOCKTNOSUPPORT, "Unsuported address family %d", - addr->sa.sa_family); break; } @@ -432,7 +427,7 @@ io_n2port(io_sockaddr_t * __restrict addr) } /* - * io_n2addr() Extract address from network structure + * io_n2addr() - Extract address from network structure * * @addr = Address * @val = Value for store string address @@ -447,6 +442,7 @@ io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t * if (!addr || !val) return ret; + AIT_INIT_VAL(val); switch (addr->sa.sa_family) { case AF_INET: if (!inet_ntop(AF_INET, &addr->sin.sin_addr, str, INET_ADDRSTRLEN)) { @@ -462,20 +458,21 @@ io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t * } else ret = str; break; + case AF_LOCAL: + ret = addr->sun.sun_path; + break; default: io_SetErr(EPROTONOSUPPORT, "Unsuported address family %d", addr->sa.sa_family); return ret; } - if (!AIT_ISEMPTY(val)) - AIT_FREE_VAL(val); AIT_SET_STR(val, ret); return (const char*) AIT_GET_STR(val); } /* - * io_gethostbyname() Get host and port and make network structure + * io_gethostbyname() - Get host and port and make network structure * * @psHost = Hostname * @port = Port @@ -485,23 +482,28 @@ io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t * io_sockaddr_t * io_gethostbyname(const char *psHost, u_short port, io_sockaddr_t * __restrict addr) { - struct hostent *host; + struct hostent *host = NULL; if (!psHost || !addr) return NULL; - - /* resolver */ - if (!addr->sa.sa_family) - host = gethostbyname(psHost); else - host = gethostbyname2(psHost, addr->sa.sa_family); - if (!host) { - io_SetErr(EINVAL, "Resolver #%d - %s", h_errno, hstrerror(h_errno)); - return NULL; - } + memset(addr, 0, sizeof(io_sockaddr_t)); - memset(addr, 0, sizeof(io_sockaddr_t)); - switch (host->h_addrtype) { + if (*psHost != '/') { + /* resolver */ + if (!addr->sa.sa_family) + host = gethostbyname(psHost); + else + host = gethostbyname2(psHost, addr->sa.sa_family); + if (!host) { + io_SetErr(EINVAL, "Resolver #%d - %s", h_errno, hstrerror(h_errno)); + return NULL; + } else + addr->sa.sa_family = host->h_addrtype; + } else + addr->sa.sa_family = AF_LOCAL; + + switch (addr->sa.sa_family) { case AF_INET: addr->sin.sin_len = sizeof(struct sockaddr_in); addr->sin.sin_family = AF_INET; @@ -514,9 +516,14 @@ io_gethostbyname(const char *psHost, u_short port, io_ addr->sin6.sin6_port = htons(port); memcpy(&addr->sin6.sin6_addr, host->h_addr, sizeof addr->sin6.sin6_addr); return addr; + case AF_LOCAL: + addr->sun.sun_len = sizeof(struct sockaddr_un); + addr->sun.sun_family = AF_LOCAL; + memset(addr->sun.sun_path, 0, sizeof addr->sun.sun_path); + snprintf(addr->sun.sun_path, sizeof addr->sun.sun_path, "%s-%hu", psHost, port); + return addr; default: - io_SetErr(EPROTONOSUPPORT, "Unsuported address family %d", - host->h_addrtype); + io_SetErr(EPROTONOSUPPORT, "Unsuported address family %d", addr->sa.sa_family); break; }