mirror of
https://github.com/termux/termux-packages
synced 2024-06-19 07:27:09 +00:00
bbe42fa887
Put libmount library in subpackage libmount, mount utilities in subpackage mount-utils, libfdisk in subpackage libfdisk, and fdisk utilities in subpackage fdisk. On my aarch64 device, /system/bin/mount is unable to handle logical volumes (tries to access the non-existing /etc/fstab and errors), so lets add our own libmount package. Enabling libmount also enables the lsblk utility, which we put in blk-utils.
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
--- ../libmount-src-tab_parse.c.orig 2022-08-08 09:25:50.094443439 +0200
|
|
+++ ./libmount/src/tab_parse.c 2022-08-08 12:55:36.856303277 +0200
|
|
@@ -835,6 +835,42 @@
|
|
return 1;
|
|
}
|
|
|
|
+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);
|
|
+}
|
|
+
|
|
#ifdef HAVE_SCANDIRAT
|
|
static int __mnt_table_parse_dir(struct libmnt_table *tb, const char *dirname)
|
|
{
|