sipwise
/
sipsak
mirror of https://github.com/sipwise/sipsak.git
1
0
Fork 0
Code Issues Releases Wiki Activity

improved is_number and re-wrote str_to_int (as results from the unit tests)

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/sipsak/trunk@421 75b5f7c7-cfd4-0310-b54c-e118b2c5249a
(cherry picked from commit db9c4ebb144a133820ffdc2d431184051832715d)
changes/49/4849/1
nils-ohlmeier 19 years ago committed by Victor Seva
parent 6d985d5ce5
commit fff1e059bd
3 changed files with 822 additions and 1100 deletions
Show Stats Download Patch File Download Diff File

290
aclocal.m4 vendored
Unescape View File

@ -11,173 +11,141 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE. # PARTICULAR PURPOSE.
m4_ifndef([AC_AUTOCONF_VERSION], dnl AM_PATH_CHECK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl dnl Test for check, and define CHECK_CFLAGS and CHECK_LIBS
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, dnl
[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to. AC_DEFUN([AM_PATH_CHECK],
If you have problems, you may need to regenerate the build system entirely. [
To do so, use the procedure documented by the package, typically `autoreconf'.])]) AC_ARG_WITH([check],
[ --with-check=PATH prefix where check is installed [default=auto]])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# min_check_version=ifelse([$1], ,0.8.2,$1)
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
# AC_MSG_CHECKING(for check - version >= $min_check_version)
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by if test x$with_check = xno; then
# the Free Software Foundation; either version 2 of the License, or AC_MSG_RESULT(disabled)
# (at your option) any later version. ifelse([$3], , AC_MSG_ERROR([disabling check is not supported]), [$3])
# else
# This program is distributed in the hope that it will be useful, but if test "x$with_check" != x; then
# WITHOUT ANY WARRANTY; without even the implied warranty of CHECK_CFLAGS="-I$with_check/include"
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU CHECK_LIBS="-L$with_check/lib -lcheck"
# General Public License for more details. else
# CHECK_CFLAGS=""
# You should have received a copy of the GNU General Public License CHECK_LIBS="-lcheck"
# along with this program; if not, write to the Free Software fi
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ac_save_CFLAGS="$CFLAGS"
# ---------------------------------- ac_save_LIBS="$LIBS"
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) CFLAGS="$CFLAGS $CHECK_CFLAGS"
m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) LIBS="$CHECK_LIBS $LIBS"
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then rm -f conf.check-test
AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) AC_TRY_RUN([
fi #include <stdio.h>
if test -n "$PKG_CONFIG"; then #include <stdlib.h>
_pkg_min_version=m4_default([$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) #include <check.h>
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes]) int main ()
else {
AC_MSG_RESULT([no]) int major, minor, micro;
PKG_CONFIG="" char *tmp_version;
fi
system ("touch conf.check-test");
fi[]dnl
])# PKG_PROG_PKG_CONFIG /* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = strdup("$min_check_version");
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
# printf("%s, bad version string\n", "$min_check_version");
# Check to see whether a particular set of modules exists. Similar return 1;
# to PKG_CHECK_MODULES(), but does not set variables or print errors. }
#
# if ((CHECK_MAJOR_VERSION != check_major_version) ||
# Similar to PKG_CHECK_MODULES, make sure that the first instance of (CHECK_MINOR_VERSION != check_minor_version) ||
# this or PKG_CHECK_MODULES is called, or make sure to call (CHECK_MICRO_VERSION != check_micro_version))
# PKG_CHECK_EXISTS manually {
# -------------------------------------------------------------- printf("\n*** The check header file (version %d.%d.%d) does not match\n",
AC_DEFUN([PKG_CHECK_EXISTS], CHECK_MAJOR_VERSION, CHECK_MINOR_VERSION, CHECK_MICRO_VERSION);
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl printf("*** the check library (version %d.%d.%d).\n",
if test -n "$PKG_CONFIG" && \ check_major_version, check_minor_version, check_micro_version);
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then return 1;
m4_ifval([$2], [$2], [:]) }
m4_ifvaln([$3], [else
$3])dnl if ((check_major_version > major) ||
fi]) ((check_major_version == major) && (check_minor_version > minor)) ||
((check_major_version == major) && (check_minor_version == minor) && (check_micro_version >= micro)))
{
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) return 0;
# --------------------------------------------- }
m4_define([_PKG_CONFIG], else
[if test -n "$PKG_CONFIG"; then {
if test -n "$$1"; then printf("\n*** An old version of check (%d.%d.%d) was found.\n",
pkg_cv_[]$1="$$1" check_major_version, check_minor_version, check_micro_version);
printf("*** You need a version of check being at least %d.%d.%d.\n", major, minor, micro);
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the check library and header\n");
printf("*** file is being found. Rerun configure with the --with-check=PATH option\n");
printf("*** to specify the prefix where the correct version was installed.\n");
}
return 1;
}
],, no_check=yes, [echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
if test "x$no_check" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else else
PKG_CHECK_EXISTS([$3], AC_MSG_RESULT(no)
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], if test -f conf.check-test ; then
[pkg_failed=yes]) :
else
echo "*** Could not run check test program, checking why..."
CFLAGS="$CFLAGS $CHECK_CFLAGS"
LIBS="$CHECK_LIBS $LIBS"
AC_TRY_LINK([
#include <stdio.h>
#include <stdlib.h>
#include <check.h>
], , [ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding check. You'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
[ echo "*** The test program failed to compile or link. See the file config.log for"
echo "*** the exact error that occured." ])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
CHECK_CFLAGS=""
CHECK_LIBS=""
rm -f conf.check-test
ifelse([$3], , AC_MSG_ERROR([check not found]), [$3])
fi fi
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
# _PKG_SHORT_ERRORS_SUPPORTED AC_SUBST(CHECK_CFLAGS)
# ----------------------------- AC_SUBST(CHECK_LIBS)
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi[]dnl
])# _PKG_SHORT_ERRORS_SUPPORTED
rm -f conf.check-test
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], fi
# [ACTION-IF-NOT-FOUND]) ])
#
# # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
# Note that if there is a possibility the first call to
# PKG_CHECK_MODULES might not happen, you should be sure to include an
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
#
#
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
AC_MSG_CHECKING([for $1])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
_PKG_TEXT
])],
[AC_MSG_RESULT([no])
$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
ifelse([$3], , :, [$3])
fi[]dnl
])# PKG_CHECK_MODULES
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# #
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,

1547
configure vendored
View File

File diff suppressed because it is too large Load Diff

85
helper.c
Unescape View File

@ -726,53 +726,78 @@ double deltaT(struct timeval *t1p, struct timeval *t2p)
int is_number(char *number) int is_number(char *number)
{ {
int digit = 1; int digit = 1;
if (strlen(number) == 0) {
return 0;
}
while (digit && (*number != '\0')) { while (digit && (*number != '\0')) {
digit = isdigit(*number); digit = isdigit(*number);
number++; number++;
} }
return digit; return digit ? 1 : 0;
} }
/* tries to convert the given string into an integer. it strips /* tries to convert the given string into an integer. it strips
* white-spaces and exits if an error happens */ * white-spaces and exits if an error happens */
int str_to_int(char *num) int str_to_int(char *num)
{ {
int ret; int ret, len;
char *end, *start;
#ifdef HAVE_STRTOL char *backup = NULL;
errno = 0;
ret = strtol(num, NULL, 10); len = strlen(num);
if (errno == EINVAL || errno == ERANGE) { if (len == 0) {
printf("%s\n", num); fprintf(stderr, "error: string has zero length: '%s'\n", num);
perror("integer converting error"); ret = 2;
exit_code(2); goto error;
} }
#else backup = malloc(len + 1);
char backup; if (!backup) {
int len = strlen(num); fprintf(stderr, "error: failed to allocate memory\n");
char *start = num; ret = 2;
char *end = num + len; goto error;
}
while (!isdigit(*start) && isspace(*start) && start < end) memcpy(backup, num, len + 1);
start = backup;
end = backup + len;
while (isspace(*start) && (start < end)) {
start++; start++;
end = start; }
end++; if (start == end) {
while (end < num + len && *end != '\0' && !isspace(*end)) fprintf(stderr, "error: string is too short: '%s'\n", num);
ret = 2;
goto error;
}
end--;
while (isspace(*end) && (end > start)) {
end--;
}
if (end != (backup + len - 1)) {
end++; end++;
backup = *end; *end = '\0';
*end = '\0'; }
if (!is_number(start)) { if (!is_number(start)) {
fprintf(stderr, "error: string is not a number: %s\n", start); fprintf(stderr, "error: string is not a number: '%s'\n", start);
exit_code(2); ret = 2;
goto error;
} }
ret = atoi(start); ret = atoi(start);
*end = backup; if (ret >= 0) {
if (ret <= 0) { free(backup);
fprintf(stderr, "error: failed to convert string to integer: %s\n", num); return ret;
exit_code(2); }
else {
fprintf(stderr, "error: failed to convert string to integer: '%s'\n", num);
ret = 2;
}
error:
if (backup) {
free(backup);
} }
#ifndef RUNNING_CHECK
exit_code(ret);
#endif #endif
return ret; return (ret * - 1);
} }
/* reads into the given buffer from standard input until the EOF /* reads into the given buffer from standard input until the EOF

Write Preview
Loading…
Cancel
Save