[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS gsasl/lib/gl
From: |
gsasl-commit |
Subject: |
CVS gsasl/lib/gl |
Date: |
Tue, 28 Jun 2005 11:55:57 +0200 |
Update of /home/cvs/gsasl/lib/gl
In directory dopio:/tmp/cvs-serv2559/gl
Modified Files:
Makefile.am
Added Files:
check-version.c check-version.h strverscmp.c strverscmp.h
Removed Files:
check_version.c check_version.h
Log Message:
Use the real check-version module.
--- /home/cvs/gsasl/lib/gl/Makefile.am 2005/06/25 09:45:37 1.21
+++ /home/cvs/gsasl/lib/gl/Makefile.am 2005/06/28 09:55:56 1.22
@@ -9,7 +9,7 @@
#
# Generated by gnulib-tool.
# Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgl --source-base=gl
--m4-base=gl/m4 --aux-dir=. --libtool --lgpl alloca-opt base64 check_version
gettext lgetdelim lgetline restrict size_max stdbool strdup vasnprintf
vasprintf xsize
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgl --source-base=gl
--m4-base=gl/m4 --aux-dir=. --libtool --lgpl alloca-opt base64 check-version
gettext lgetdelim lgetline restrict size_max stdbool strdup strverscmp
vasnprintf vasprintf xsize
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
@@ -46,12 +46,6 @@
## end gnulib module base64
-## begin gnulib module check_version
-
-libgl_la_SOURCES += check_version.h check_version.c
-
-## end gnulib module check_version
-
## begin gnulib module gettext
libgl_la_SOURCES += gettext.h
--- /home/cvs/gsasl/lib/gl/check-version.c 2005/06/28 09:55:57 NONE
+++ /home/cvs/gsasl/lib/gl/check-version.c 2005/06/28 09:55:57 1.1
/* check-version.h --- Check version string compatibility.
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Written by Simon Josefsson. This interface is influenced by
gcry_check_version from Werner Koch's Libgcrypt. Paul Eggert
suggested the use of strverscmp to simplify implementation. */
#if HAVE_CONFIG_H
# include "config.h"
#endif
#include <stddef.h>
#include <strverscmp.h>
/* Get specification. */
#include "check_version.h"
/* Check that the the version of the library (i.e., the CPP symbol
* VERSION) is at minimum the requested one in REQ_VERSION (typically
* found in a header file) and return the version string. Return NULL
* if the condition is not satisfied. If a NULL is passed to this
* function, no check is done, but the version string is simply
* returned.
*/
const char *
check_version (const char *req_version)
{
if (!req_version || strverscmp (req_version, VERSION) < 0)
return VERSION;
return NULL;
}
--- /home/cvs/gsasl/lib/gl/check-version.h 2005/06/28 09:55:57 NONE
+++ /home/cvs/gsasl/lib/gl/check-version.h 2005/06/28 09:55:57 1.1
/* check-version.h --- Check version string compatibility.
Copyright (C) 2005 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Written by Simon Josefsson. */
#ifndef CHECK_VERSION_H
# define CHECK_VERSION_H
extern const char *
check_version (const char *req_version);
#endif /* CHECK_VERSION_H */
--- /home/cvs/gsasl/lib/gl/strverscmp.c 2005/06/28 09:55:57 NONE
+++ /home/cvs/gsasl/lib/gl/strverscmp.c 2005/06/28 09:55:57 1.1
/* Compare strings while treating digits characters numerically.
Copyright (C) 1997, 2000, 2002, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jean-François Bignolles <address@hidden>, 1997.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#if HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h>
#include <ctype.h>
/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
fractional parts, S_Z: idem but with leading Zeroes only */
#define S_N 0x0
#define S_I 0x4
#define S_F 0x8
#define S_Z 0xC
/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
#define CMP 2
#define LEN 3
/* ISDIGIT differs from isdigit, as follows:
- Its arg may be any int or unsigned int; it need not be an unsigned char.
- It's guaranteed to evaluate its argument exactly once.
- It's typically faster.
POSIX says that only '0' through '9' are digits. Prefer ISDIGIT to
ISDIGIT_LOCALE unless it's important to use the locale's definition
of `digit' even when the host does not conform to POSIX. */
#define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9)
#undef __strverscmp
#undef strverscmp
#ifndef weak_alias
# define __strverscmp strverscmp
#endif
/* Compare S1 and S2 as strings holding indices/version numbers,
returning less than, equal to or greater than zero if S1 is less than,
equal to or greater than S2 (for more info, see the texinfo doc).
*/
int
__strverscmp (const char *s1, const char *s2)
{
const unsigned char *p1 = (const unsigned char *) s1;
const unsigned char *p2 = (const unsigned char *) s2;
unsigned char c1, c2;
int state;
int diff;
/* Symbol(s) 0 [1-9] others (padding)
Transition (10) 0 (01) d (00) x (11) - */
static const unsigned int next_state[] =
{
/* state x d 0 - */
/* S_N */ S_N, S_I, S_Z, S_N,
/* S_I */ S_N, S_I, S_I, S_I,
/* S_F */ S_N, S_F, S_F, S_F,
/* S_Z */ S_N, S_F, S_Z, S_Z
};
static const int result_type[] =
{
/* state x/x x/d x/0 x/- d/x d/d d/0 d/-
0/x 0/d 0/0 0/- -/x -/d -/0 -/- */
/* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
/* S_I */ CMP, -1, -1, CMP, 1, LEN, LEN, CMP,
1, LEN, LEN, CMP, CMP, CMP, CMP, CMP,
/* S_F */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
/* S_Z */ CMP, 1, 1, CMP, -1, CMP, CMP, CMP,
-1, CMP, CMP, CMP
};
if (p1 == p2)
return 0;
c1 = *p1++;
c2 = *p2++;
/* Hint: '0' is a digit too. */
state = S_N | ((c1 == '0') + (ISDIGIT (c1) != 0));
while ((diff = c1 - c2) == 0 && c1 != '\0')
{
state = next_state[state];
c1 = *p1++;
c2 = *p2++;
state |= (c1 == '0') + (ISDIGIT (c1) != 0);
}
state = result_type[state << 2 | ((c2 == '0') + (ISDIGIT (c2) != 0))];
switch (state)
{
case CMP:
return diff;
case LEN:
while (ISDIGIT (*p1++))
if (!ISDIGIT (*p2++))
return 1;
return ISDIGIT (*p2) ? -1 : diff;
default:
return state;
}
}
#ifdef weak_alias
weak_alias (__strverscmp, strverscmp)
#endif
--- /home/cvs/gsasl/lib/gl/strverscmp.h 2005/06/28 09:55:57 NONE
+++ /home/cvs/gsasl/lib/gl/strverscmp.h 2005/06/28 09:55:57 1.1
/* Compare strings while treating digits characters numerically.
Copyright (C) 1997, 2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef STRVERSCMP_H_
# define STRVERSCMP_H_
int strverscmp (const char *, const char *);
#endif /* not STRVERSCMP_H_ */
- CVS gsasl/lib/gl, gsasl-commit, 2005/06/15
- CVS gsasl/lib/gl, gsasl-commit, 2005/06/25
- CVS gsasl/lib/gl, gsasl-commit, 2005/06/25
- CVS gsasl/lib/gl, gsasl-commit, 2005/06/28
- CVS gsasl/lib/gl, gsasl-commit, 2005/06/28
- CVS gsasl/lib/gl,
gsasl-commit <=
- CVS gsasl/lib/gl, gsasl-commit, 2005/06/28