tools: replace alphasort() with versionsort()
PATCH 1/1 tools: replace alphasort() with versionsort()
From: Bartosz Golaszewski <[email protected]>
With a high enough number of chips, gpiodetect currently sorts them like this:
gpiochip0
gpiochip1
gpiochip10
gpiochip11
gpiochip12
gpiochip13
gpiochip14
gpiochip15
gpiochip16
gpiochip17
gpiochip18
gpiochip19
gpiochip2
gpiochip20
gpiochip21
gpiochip22
gpiochip23
gpiochip24
gpiochip25
gpiochip26
gpiochip3
gpiochip4
gpiochip5
gpiochip6
gpiochip7
gpiochip8
gpiochip9
Switching to using versionsort() instead of alphasort() makes it look better and the order is more logical:
gpiochip0
gpiochip1
gpiochip2
gpiochip3
gpiochip4
gpiochip5
gpiochip6
gpiochip7
gpiochip8
gpiochip9
gpiochip10
gpiochip11
gpiochip12
gpiochip13
gpiochip14
gpiochip15
gpiochip16
gpiochip17
gpiochip18
gpiochip19
gpiochip20
gpiochip21
gpiochip22
gpiochip23
gpiochip24
gpiochip25
gpiochip26
--- configure.ac | 2 +- tools/tools-common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
configure.ac +1 -1
@@ -119,7 +119,7 @@ AS_IF([test "x$with_tools" = xtrue], AC_CHECK_FUNC([daemon], [], [FUNC_NOT_FOUND_TOOLS([daemon])]) AC_CHECK_FUNC([asprintf], [], [FUNC_NOT_FOUND_LIB([asprintf])]) AC_CHECK_FUNC([scandir], [], [FUNC_NOT_FOUND_LIB([scandir])]) - AC_CHECK_FUNC([alphasort], [], [FUNC_NOT_FOUND_LIB([alphasort])]) + AC_CHECK_FUNC([versionsort], [], [FUNC_NOT_FOUND_LIB([versionsort])]) AS_IF([test "x$with_gpioset_interactive" = xtrue], [PKG_CHECK_MODULES([LIBEDIT], [libedit >= 3.1])]) ])
tools/tools-common.c +1 -1
@@ -469,7 +469,7 @@ int all_chip_paths(char ***paths_ptr)struct dirent **entries;char **paths; - num_chips =scandir ("/dev/" , &entries, chip_dir_filter, alphasort); + num_chips =scandir ("/dev/" , &entries, chip_dir_filter, versionsort);if (num_chips <0 )die_perror ("unable to scan /dev" );
Signature · 1 line
2.37.2
Quoted 64 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
With a high enough number of chips, gpiodetect currently sorts them like this:
gpiochip0
gpiochip1
gpiochip10
gpiochip11
gpiochip12
gpiochip13
gpiochip14
gpiochip15
gpiochip16
gpiochip17
gpiochip18
gpiochip19
gpiochip2
gpiochip20
gpiochip21
gpiochip22
gpiochip23
gpiochip24
gpiochip25
gpiochip26
gpiochip3
gpiochip4
gpiochip5
gpiochip6
gpiochip7
gpiochip8
gpiochip9Switching to using
versionsort()instead ofalphasort()makes it look better and the order is more logical:gpiochip0
gpiochip1
gpiochip2
gpiochip3
gpiochip4
gpiochip5
gpiochip6
gpiochip7
gpiochip8
gpiochip9
gpiochip10
gpiochip11
gpiochip12
gpiochip13
gpiochip14
gpiochip15
gpiochip16
gpiochip17
gpiochip18
gpiochip19
gpiochip20
gpiochip21
gpiochip22
gpiochip23
gpiochip24
gpiochip25
gpiochip26
Quoted 1 line
Signed-off-by Bartosz Golaszewski <[email protected]>
The checkin comment is a bit excessive - perhaps just list an example where it gets it wrong, like gpiochip10 < gpiochip2?
But otherwise it makes sense.
Quoted 34 lines
--- configure.ac | 2 +- tools/tools-common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)configure.ac +1
-1@@ -119,7 +119,7 @@ AS_IF([test "x$with_tools" = xtrue], AC_CHECK_FUNC([daemon], [], [FUNC_NOT_FOUND_TOOLS([daemon])]) AC_CHECK_FUNC([asprintf], [], [FUNC_NOT_FOUND_LIB([asprintf])]) AC_CHECK_FUNC([scandir], [], [FUNC_NOT_FOUND_LIB([scandir])]) - AC_CHECK_FUNC([alphasort], [], [FUNC_NOT_FOUND_LIB([alphasort])]) + AC_CHECK_FUNC([versionsort], [], [FUNC_NOT_FOUND_LIB([versionsort])]) AS_IF([test "x$with_gpioset_interactive" = xtrue], [PKG_CHECK_MODULES([LIBEDIT], [libedit >= 3.1])]) ])tools/tools-common.c +1
-1@@ -469,7 +469,7 @@ int all_chip_paths(char ***paths_ptr)struct dirent **entries;char **paths; - num_chips =scandir ("/dev/" , &entries, chip_dir_filter, alphasort); + num_chips =scandir ("/dev/" , &entries, chip_dir_filter, versionsort);if (num_chips <0 )die_perror ("unable to scan /dev" );Signature · 1 line
2.37.2
Quoted 4 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
With a high enough number of chips, gpiodetect currently sorts them like this:
(...)
Quoted 1 line
Signed-off-by Bartosz Golaszewski <[email protected]>
Yours,
Linus Walleij