On Sat, Jan 3, 2009 at 4:58 PM, Denys Vlasenko <[email protected]> wrote:
> On Friday 02 January 2009 22:50, Hai Zaar wrote:
>> On Fri, Dec 26, 2008 at 1:20 AM, Khem Raj <[email protected]> wrote:
>> > On (24/12/08 17:23), Hai Zaar wrote:
>> >> Hi!
>> >> This patch adds versionsort() and strverscmp() functions to uClibc.
>> >> The patch is against uClibc-0.9.29 and is verified to work correctly
>> >> on at91sam9260 board.
>> >
>> > Thanks for patch.
>> > Is it possible for you to test is against svn trunk
>> Attached is the patch against today's snapshot. Tested on ARM platform.
>
> +int strverscmp (s1, s2)
> + const char *s1;
> + const char *s2;
> +{
>
> It's 2009, I think we can do away with old C style definitions.
Fixed
>
>
> +#define S_N 0x0
> +#define S_I 0x4
> +#define S_F 0x8
> +#define S_Z 0xC
> ...
> +#define CMP 2
> +#define LEN 3
> ...
> + 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
> + };
>
> This is a waste of memory, since these values fit into int8_t.
> Please use smaller datatype.
Fixed
>
>
> --- ./libc/misc/dirent/versionsort.c.orig 2008-12-27 21:13:47.000000000
> +0200
> +++ ./libc/misc/dirent/versionsort.c 2008-12-27 21:13:47.000000000 +0200
> @@ -0,0 +1,16 @@
> +/*
> + * Copyright (C) 2000-2006 Erik Andersen <[email protected]>
> + *
> + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
> + */
>
> You are not Erik Andersen, I think you should put your name
> in the new files you create.
Fixed
Corrected patch is attached.
P.S. Please CC me. Thanks.
--
Zaar
www.codefidence.com
--- ./include/string.h.orig 2008-12-27 02:10:18.000000000 +0200
+++ ./include/string.h 2008-12-27 21:15:06.000000000 +0200
@@ -422,11 +422,9 @@
#ifdef __USE_GNU
/* Compare S1 and S2 as strings holding name & indices/version numbers. */
-# if 0
extern int strverscmp (__const char *__s1, __const char *__s2)
__THROW __attribute_pure__ __nonnull ((1, 2));
libc_hidden_proto(strverscmp)
-# endif
/* Return a string describing the meaning of the signal number in SIG. */
extern char *strsignal (int __sig) __THROW;
--- ./include/dirent.h.orig 2008-12-27 02:10:18.000000000 +0200
+++ ./include/dirent.h 2008-12-27 21:13:47.000000000 +0200
@@ -293,6 +293,25 @@
__THROW __attribute_pure__ __nonnull ((1, 2));
# endif
+/* Function to compare two `struct dirent's alphabetically. */
+# ifndef __USE_FILE_OFFSET64
+extern int versionsort (__const void *__e1, __const void *__e2)
+ __THROW __attribute_pure__ __nonnull ((1, 2));
+# else
+# ifdef __REDIRECT
+extern int __REDIRECT (versionsort,
+ (__const void *__e1, __const void *__e2),
+ versionsort64) __attribute_pure__ __nonnull ((1, 2));
+# else
+# define versionsort versionsort64
+# endif
+# endif
+
+# if defined __USE_GNU && defined __USE_LARGEFILE64
+extern int versionsort64 (__const void *__e1, __const void *__e2)
+ __THROW __attribute_pure__ __nonnull ((1, 2));
+# endif
+
#endif /* Use BSD or misc. */
__END_DECLS
--- ./libc/string/generic/strverscmp.c.orig 2008-12-27 21:13:47.000000000 +0200
+++ ./libc/string/generic/strverscmp.c 2008-12-27 21:13:47.000000000 +0200
@@ -0,0 +1,114 @@
+/* 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.
+ This file is part of the GNU C Library.
+ Contributed by Jean-François Bignolles <[email protected]>, 1997.
+
+ Derived work for uClibc by Hai Zaar, Codefidence Ltd <[email protected]>
+
+ 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.
+
+ The GNU C Library 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 the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <string.h>
+#include <ctype.h>
+#include <stdint.h>
+
+
+/* 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 (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 uint8_t 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 int8_t 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;
+ }
+}
+
--- ./libc/misc/dirent/versionsort64.c.orig 2008-12-27 21:13:47.000000000 +0200
+++ ./libc/misc/dirent/versionsort64.c 2008-12-27 21:13:47.000000000 +0200
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2008-2009 Hai Zaar, Codefidence Ltd <[email protected]>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
+
+#include <_lfs_64.h>
+
+#include <dirent.h>
+#include <string.h>
+#include "dirstream.h"
+
+int versionsort64(const void * a, const void * b)
+{
+ return strverscmp ((*(const struct dirent64 **) a)->d_name,
+ (*(const struct dirent64 **) b)->d_name);
+}
--- ./libc/misc/dirent/Makefile.in.orig 2008-12-27 02:10:45.000000000 +0200
+++ ./libc/misc/dirent/Makefile.in 2008-12-27 23:23:24.000000000 +0200
@@ -6,10 +6,10 @@
#
CSRC := alphasort.c closedir.c dirfd.c opendir.c readdir.c rewinddir.c \
- scandir.c seekdir.c telldir.c readdir_r.c
+ scandir.c seekdir.c telldir.c readdir_r.c versionsort.c
ifeq ($(UCLIBC_HAS_LFS),y)
-CSRC += readdir64.c alphasort64.c scandir64.c readdir64_r.c
+CSRC += readdir64.c alphasort64.c scandir64.c readdir64_r.c versionsort64.c
endif
MISC_DIRENT_DIR := $(top_srcdir)libc/misc/dirent
_______________________________________________
uClibc mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/uclibc
