diff options
author | Greg V <greg@unrelenting.technology> | 2018-07-10 13:49:26 +0300 |
---|---|---|
committer | Greg V <greg@unrelenting.technology> | 2018-07-16 13:44:11 +0300 |
commit | f8b412052edecf1f47bfe123f4937907543009e2 (patch) | |
tree | ded49d764c9b6b344197d03c2ba1988c2c496904 /src | |
parent | 8362031064e8c788b1645488002e0a556ea0466b (diff) |
Import versionsort implementation from musl for systems without versionsort
versionsort is a GNU extension, not available on *BSD systems.
Diffstat (limited to 'src')
-rw-r--r-- | src/libinput-versionsort.h | 71 | ||||
-rw-r--r-- | src/quirks.c | 1 |
2 files changed, 72 insertions, 0 deletions
diff --git a/src/libinput-versionsort.h b/src/libinput-versionsort.h new file mode 100644 index 00000000..356ec8da --- /dev/null +++ b/src/libinput-versionsort.h @@ -0,0 +1,71 @@ +#pragma once + +#include "config.h" + +#ifndef HAVE_VERSIONSORT + +/* Copyright © 2005-2014 Rich Felker, et al. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include <ctype.h> +#include <string.h> +#include <dirent.h> + +static int +strverscmp(const char *l0, const char *r0) +{ + const unsigned char *l = (const void *)l0; + const unsigned char *r = (const void *)r0; + size_t i, dp, j; + int z = 1; + + /* Find maximal matching prefix and track its maximal digit + * suffix and whether those digits are all zeros. */ + for (dp=i=0; l[i]==r[i]; i++) { + int c = l[i]; + if (!c) return 0; + if (!isdigit(c)) dp=i+1, z=1; + else if (c!='0') z=0; + } + + if (l[dp]!='0' && r[dp]!='0') { + /* If we're not looking at a digit sequence that began + * with a zero, longest digit string is greater. */ + for (j=i; isdigit(l[j]); j++) + if (!isdigit(r[j])) return 1; + if (isdigit(r[j])) return -1; + } else if (z && dp<i && (isdigit(l[i]) || isdigit(r[i]))) { + /* Otherwise, if common prefix of digit sequence is + * all zeros, digits order less than non-digits. */ + return (unsigned char)(l[i]-'0') - (unsigned char)(r[i]-'0'); + } + + return l[i] - r[i]; +} + +static int +versionsort(const struct dirent **a, const struct dirent **b) +{ + return strverscmp((*a)->d_name, (*b)->d_name); +} + +#endif diff --git a/src/quirks.c b/src/quirks.c index 951c76bc..e83f398b 100644 --- a/src/quirks.c +++ b/src/quirks.c @@ -35,6 +35,7 @@ #include <dirent.h> #include <fnmatch.h> +#include "libinput-versionsort.h" #include "libinput-util.h" #include "libinput-private.h" |