Remove unused strverscmp substitute
Our internal vercmp function was the only user of this, and it no longer relies on it. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
5078ca580e
commit
e6fb229534
|
@ -170,7 +170,7 @@ AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
|
||||||
AC_FUNC_MKTIME
|
AC_FUNC_MKTIME
|
||||||
AC_TYPE_SIGNAL
|
AC_TYPE_SIGNAL
|
||||||
AC_CHECK_FUNCS([geteuid realpath regcomp strcasecmp \
|
AC_CHECK_FUNCS([geteuid realpath regcomp strcasecmp \
|
||||||
strndup strrchr strsep strverscmp swprintf \
|
strndup strrchr strsep swprintf \
|
||||||
wcwidth uname])
|
wcwidth uname])
|
||||||
|
|
||||||
# Enable large file support if available
|
# Enable large file support if available
|
||||||
|
|
|
@ -48,108 +48,6 @@
|
||||||
#include "alpm_list.h"
|
#include "alpm_list.h"
|
||||||
#include "md5.h"
|
#include "md5.h"
|
||||||
|
|
||||||
#ifndef HAVE_STRVERSCMP
|
|
||||||
/* GNU's strverscmp() function, taken from glibc 2.3.2 sources
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Compare strings while treating digits characters numerically.
|
|
||||||
Copyright (C) 1997, 2002 Free Software Foundation, Inc.
|
|
||||||
Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
|
|
||||||
|
|
||||||
The GNU C Library 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 of the License, or (at your option) any later version.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
|
|
||||||
fractionnal 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
|
|
||||||
|
|
||||||
/* 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 (s1, s2)
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef HAVE_STRSEP
|
#ifndef HAVE_STRSEP
|
||||||
/* This is a replacement for strsep which is not portable (missing on Solaris).
|
/* This is a replacement for strsep which is not portable (missing on Solaris).
|
||||||
* Copyright (c) 2001 by François Gouget <fgouget_at_codeweavers.com> */
|
* Copyright (c) 2001 by François Gouget <fgouget_at_codeweavers.com> */
|
||||||
|
|
|
@ -73,9 +73,6 @@ int _alpm_lstat(const char *path, struct stat *buf);
|
||||||
int _alpm_test_md5sum(const char *filepath, const char *md5sum);
|
int _alpm_test_md5sum(const char *filepath, const char *md5sum);
|
||||||
char *_alpm_archive_fgets(char *line, size_t size, struct archive *a);
|
char *_alpm_archive_fgets(char *line, size_t size, struct archive *a);
|
||||||
|
|
||||||
#ifndef HAVE_STRVERSCMP
|
|
||||||
int strverscmp(const char *, const char *);
|
|
||||||
#endif
|
|
||||||
#ifndef HAVE_STRSEP
|
#ifndef HAVE_STRSEP
|
||||||
char *strsep(char **, const char *);
|
char *strsep(char **, const char *);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue