Control: tags 1052022 + patch Control: tags 1052022 + pending
Dear maintainer,
Christian Göttsche has prepared an NMU for ncdu (versioned as
1.19-0.1) (as for the previous 3 versions).
This drops a couple of build-fix patches that upstream has
adopted and includes the fairly small upstream changes for 1.19.
- Fix typo in --exclude-from argument
- Add --(enable|disable)-natsort options
- Add indicator to apparent size/disk usage selection in the footer
I have sponsored this and uploaded it to DELAYED/10.
The debdiff is attached.
Please feel free to tell me if I should delay it longer.
Wookey
--
Principal hats: Debian, Wookware, ARM
http://wookware.org/
diff -Nru ncdu-1.18/ChangeLog ncdu-1.19/ChangeLog --- ncdu-1.18/ChangeLog 2022-12-06 09:45:51.000000000 +0000 +++ ncdu-1.19/ChangeLog 2023-09-11 20:00:35.000000000 +0100 @@ -1,3 +1,11 @@ +1.19 - 2023-09-11 + - Fix typo in --exclude-from argument + - Add --(enable|disable)-natsort options + - Add indicator to apparent size/disk usage selection in the footer + +1.18.1 - 2023-02-12 + - Fix build on non-Linux platforms + 1.18 - 2022-12-06 - Fix 'dark-bg' color scheme to actually have a dark background - Backport configuration file support from 2.x diff -Nru ncdu-1.18/configure ncdu-1.19/configure --- ncdu-1.18/configure 2022-12-06 09:47:01.000000000 +0000 +++ ncdu-1.19/configure 2023-09-11 19:59:45.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for ncdu 1.18. +# Generated by GNU Autoconf 2.71 for ncdu 1.19. # # Report bugs to <[email protected]>. # @@ -610,8 +610,8 @@ # Identity of this package. PACKAGE_NAME='ncdu' PACKAGE_TARNAME='ncdu' -PACKAGE_VERSION='1.18' -PACKAGE_STRING='ncdu 1.18' +PACKAGE_VERSION='1.19' +PACKAGE_STRING='ncdu 1.19' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1315,7 +1315,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ncdu 1.18 to adapt to many kinds of systems. +\`configure' configures ncdu 1.19 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1382,7 +1382,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ncdu 1.18:";; + short | recursive ) echo "Configuration of ncdu 1.19:";; esac cat <<\_ACEOF @@ -1492,7 +1492,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ncdu configure 1.18 +ncdu configure 1.19 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1959,7 +1959,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ncdu $as_me 1.18, which was +It was created by ncdu $as_me 1.19, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3232,7 +3232,7 @@ # Define the identity of the package. PACKAGE='ncdu' - VERSION='1.18' + VERSION='1.19' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -7317,7 +7317,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ncdu $as_me 1.18, which was +This file was extended by ncdu $as_me 1.19, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7385,7 +7385,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -ncdu config.status 1.18 +ncdu config.status 1.19 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -Nru ncdu-1.18/configure.ac ncdu-1.19/configure.ac --- ncdu-1.18/configure.ac 2022-12-06 09:46:39.000000000 +0000 +++ ncdu-1.19/configure.ac 2023-09-11 19:58:01.000000000 +0100 @@ -1,5 +1,5 @@ -AC_INIT([ncdu],[1.18],[[email protected]]) +AC_INIT([ncdu],[1.19],[[email protected]]) AC_CONFIG_SRCDIR([src/global.h]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign std-options subdir-objects]) diff -Nru ncdu-1.18/COPYING ncdu-1.19/COPYING --- ncdu-1.18/COPYING 2022-04-28 10:17:42.000000000 +0100 +++ ncdu-1.19/COPYING 2023-02-12 07:41:53.000000000 +0000 @@ -1,4 +1,4 @@ -Copyright (c) 2007-2022 Yoran Heling +Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/debian/changelog ncdu-1.19/debian/changelog --- ncdu-1.18/debian/changelog 2023-02-08 16:15:32.000000000 +0000 +++ ncdu-1.19/debian/changelog 2023-09-13 18:39:36.000000000 +0100 @@ -1,3 +1,11 @@ +ncdu (1.19-0.1) unstable; urgency=medium + + * Non-maintainer upload. + * New upstream version 1.19 (Closes: #1052022) + * d/patches: drop upstream applied ones + + -- Christian Göttsche <[email protected]> Wed, 13 Sep 2023 19:39:36 +0200 + ncdu (1.18-0.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru ncdu-1.18/debian/patches/0001-Fix-build-failure-if-exclude-kernfs-option-is-not-av.patch ncdu-1.19/debian/patches/0001-Fix-build-failure-if-exclude-kernfs-option-is-not-av.patch --- ncdu-1.18/debian/patches/0001-Fix-build-failure-if-exclude-kernfs-option-is-not-av.patch 2023-02-08 16:15:32.000000000 +0000 +++ ncdu-1.19/debian/patches/0001-Fix-build-failure-if-exclude-kernfs-option-is-not-av.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -From: Yorhel <[email protected]> -Date: Wed, 8 Feb 2023 08:14:19 +0100 -Subject: Fix build failure if exclude-kernfs option is not available - -Applied-Upstream: https://code.blicky.net/yorhel/ncdu/commit/699394164692e0a037a75b72aec60e3942e86385 - -Fixes #218 ---- - src/dir_scan.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dir_scan.c b/src/dir_scan.c -index 7c1bc77..9c182f3 100644 ---- a/src/dir_scan.c -+++ b/src/dir_scan.c -@@ -51,6 +51,7 @@ - - - int dir_scan_smfs; /* Stay on the same filesystem */ -+int exclude_kernfs; /* Exclude Linux pseudo filesystems */ - - static uint64_t curdev; /* current device we're scanning on */ - -@@ -61,7 +62,6 @@ static unsigned int buf_nlink; - - - #if HAVE_LINUX_MAGIC_H && HAVE_SYS_STATFS_H && HAVE_STATFS --int exclude_kernfs; /* Exclude Linux pseudo filesystems */ - - static int is_kernfs(unsigned long type) { - if( diff -Nru ncdu-1.18/debian/patches/0002-Really-fix-build-failure-if-exclude-kernfs-option-is.patch ncdu-1.19/debian/patches/0002-Really-fix-build-failure-if-exclude-kernfs-option-is.patch --- ncdu-1.18/debian/patches/0002-Really-fix-build-failure-if-exclude-kernfs-option-is.patch 2023-02-08 16:15:32.000000000 +0000 +++ ncdu-1.19/debian/patches/0002-Really-fix-build-failure-if-exclude-kernfs-option-is.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -From: Yorhel <[email protected]> -Date: Wed, 8 Feb 2023 14:23:46 +0100 -Subject: Really fix build failure if exclude-kernfs option is not available - -Applied-Upstream: https://code.blicky.net/yorhel/ncdu/commit/daaca0a90309f173f21045c3b1357a25a5f3fd58 - -Fixes #218, for real this time. ---- - src/dir.h | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/dir.h b/src/dir.h -index 7dc9757..653eb2e 100644 ---- a/src/dir.h -+++ b/src/dir.h -@@ -107,16 +107,13 @@ extern int (*dir_process)(void); - - /* Scanning a live directory */ - extern int dir_scan_smfs; -+extern int exclude_kernfs; - void dir_scan_init(const char *path); - - /* Importing a file */ - extern int dir_import_active; - int dir_import_init(const char *fn); - --#if HAVE_LINUX_MAGIC_H && HAVE_SYS_STATFS_H && HAVE_STATFS --extern int exclude_kernfs; --#endif -- - - /* The currently configured output functions. */ - extern struct dir_output dir_output; diff -Nru ncdu-1.18/debian/patches/series ncdu-1.19/debian/patches/series --- ncdu-1.18/debian/patches/series 2023-02-08 16:15:32.000000000 +0000 +++ ncdu-1.19/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -0001-Fix-build-failure-if-exclude-kernfs-option-is-not-av.patch -0002-Really-fix-build-failure-if-exclude-kernfs-option-is.patch diff -Nru ncdu-1.18/doc/ncdu.pod ncdu-1.19/doc/ncdu.pod --- ncdu-1.18/doc/ncdu.pod 2022-11-30 10:41:31.000000000 +0000 +++ ncdu-1.19/doc/ncdu.pod 2023-03-05 07:36:09.000000000 +0000 @@ -238,6 +238,10 @@ ascending or descending, respectively. e.g. C<--sort=name-desc> will sort by name in descending order. +=item B<--enable-natsort>, B<--disable-natsort> + +Enable (default) or disable natural sort when sorting by file name. + =item B<--group-directories-first>, B<--no-group-directories-first> Sort (or not) directories before files. diff -Nru ncdu-1.18/ncdu.1 ncdu-1.19/ncdu.1 --- ncdu-1.18/ncdu.1 2022-12-06 09:47:02.000000000 +0000 +++ ncdu-1.19/ncdu.1 2023-03-05 07:36:48.000000000 +0000 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "NCDU 1" -.TH NCDU 1 "2022-11-30" "ncdu-1.18" "ncdu manual" +.TH NCDU 1 "2023-03-05" "ncdu-1.18.1" "ncdu manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -329,6 +329,9 @@ The column can be suffixed with \fI\-asc\fR or \fI\-desc\fR to set the order to ascending or descending, respectively. e.g. \f(CW\*(C`\-\-sort=name\-desc\*(C'\fR will sort by name in descending order. +.IP "\fB\-\-enable\-natsort\fR, \fB\-\-disable\-natsort\fR" 4 +.IX Item "--enable-natsort, --disable-natsort" +Enable (default) or disable natural sort when sorting by file name. .IP "\fB\-\-group\-directories\-first\fR, \fB\-\-no\-group\-directories\-first\fR" 4 .IX Item "--group-directories-first, --no-group-directories-first" Sort (or not) directories before files. diff -Nru ncdu-1.18/README ncdu-1.19/README --- ncdu-1.18/README 2022-12-06 09:46:30.000000000 +0000 +++ ncdu-1.19/README 2023-09-11 19:57:53.000000000 +0100 @@ -1,4 +1,4 @@ -ncdu 1.18 +ncdu 1.19 ========= DESCRIPTION @@ -33,7 +33,7 @@ COPYING - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/browser.c ncdu-1.19/src/browser.c --- ncdu-1.18/src/browser.c 2022-11-30 10:38:20.000000000 +0000 +++ ncdu-1.19/src/browser.c 2023-03-03 07:44:44.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -289,15 +289,18 @@ mvhline(winrows-1, 0, ' ', wincols); if(t) { if(!show_as) attron(A_BOLD); - mvaddstr(winrows-1, 0, " Total disk usage: "); + mvaddchc(UIC_HD, winrows-1, 0, show_as ? ' ' : '*'); + addstr("Total disk usage: "); if(!show_as) attroff(A_BOLD); printsize(UIC_HD, t->parent->size); if(show_as) attron(A_BOLD); - addstrc(UIC_HD, " Apparent size: "); + addstrc(UIC_HD, " "); + addchc(UIC_HD, show_as ? '*' : ' '); + addstrc(UIC_HD, "Apparent size: "); if(show_as) attroff(A_BOLD); uic_set(UIC_NUM_HD); printsize(UIC_HD, t->parent->asize); - addstrc(UIC_HD, " Items: "); + addstrc(UIC_HD, " Items: "); uic_set(UIC_NUM_HD); printw("%d", t->parent->items); } else diff -Nru ncdu-1.18/src/browser.h ncdu-1.19/src/browser.h --- ncdu-1.18/src/browser.h 2022-04-28 10:16:38.000000000 +0100 +++ ncdu-1.19/src/browser.h 2023-02-12 07:40:28.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/delete.c ncdu-1.19/src/delete.c --- ncdu-1.18/src/delete.c 2022-11-05 15:21:15.000000000 +0000 +++ ncdu-1.19/src/delete.c 2023-02-12 07:40:31.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/delete.h ncdu-1.19/src/delete.h --- ncdu-1.18/src/delete.h 2022-11-05 15:21:22.000000000 +0000 +++ ncdu-1.19/src/delete.h 2023-02-12 07:40:37.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/dir_common.c ncdu-1.19/src/dir_common.c --- ncdu-1.18/src/dir_common.c 2022-11-06 12:35:02.000000000 +0000 +++ ncdu-1.19/src/dir_common.c 2023-02-12 07:40:43.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/dir_export.c ncdu-1.19/src/dir_export.c --- ncdu-1.18/src/dir_export.c 2022-04-28 10:16:49.000000000 +0100 +++ ncdu-1.19/src/dir_export.c 2023-02-12 07:40:46.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/dir.h ncdu-1.19/src/dir.h --- ncdu-1.18/src/dir.h 2022-04-28 10:16:45.000000000 +0100 +++ ncdu-1.19/src/dir.h 2023-02-12 07:40:40.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -107,16 +107,13 @@ /* Scanning a live directory */ extern int dir_scan_smfs; +extern int exclude_kernfs; void dir_scan_init(const char *path); /* Importing a file */ extern int dir_import_active; int dir_import_init(const char *fn); -#if HAVE_LINUX_MAGIC_H && HAVE_SYS_STATFS_H && HAVE_STATFS -extern int exclude_kernfs; -#endif - /* The currently configured output functions. */ extern struct dir_output dir_output; diff -Nru ncdu-1.18/src/dir_import.c ncdu-1.19/src/dir_import.c --- ncdu-1.18/src/dir_import.c 2022-04-28 10:16:51.000000000 +0100 +++ ncdu-1.19/src/dir_import.c 2023-02-12 07:40:49.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/dirlist.c ncdu-1.19/src/dirlist.c --- ncdu-1.18/src/dirlist.c 2022-04-28 10:16:59.000000000 +0100 +++ ncdu-1.19/src/dirlist.c 2023-03-05 07:34:13.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -39,7 +39,8 @@ int dirlist_sort_desc = 1, dirlist_sort_col = DL_COL_SIZE, dirlist_sort_df = 0, - dirlist_hidden = 0; + dirlist_hidden = 0, + dirlist_natsort = 1; /* private state vars */ static struct dir *parent_alloc, *head, *head_real, *selected, *top = NULL; @@ -80,7 +81,7 @@ * * Note that the method used below is supposed to be fast, not readable :-) */ -#define CMP_NAME strnatcmp(x->name, y->name) +#define CMP_NAME (dirlist_natsort ? strnatcmp(x->name, y->name) : strcmp(x->name, y->name)) #define CMP_SIZE (x->size > y->size ? 1 : (x->size == y->size ? 0 : -1)) #define CMP_ASIZE (x->asize > y->asize ? 1 : (x->asize == y->asize ? 0 : -1)) #define CMP_ITEMS (x->items > y->items ? 1 : (x->items == y->items ? 0 : -1)) diff -Nru ncdu-1.18/src/dirlist.h ncdu-1.19/src/dirlist.h --- ncdu-1.18/src/dirlist.h 2022-04-28 10:17:01.000000000 +0100 +++ ncdu-1.19/src/dirlist.h 2023-03-05 07:34:55.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -78,6 +78,8 @@ /* set with dirlist_set_hidden() */ extern int dirlist_hidden; +extern int dirlist_natsort; + /* maximum size of an item in the opened dir */ extern int64_t dirlist_maxs, dirlist_maxa; diff -Nru ncdu-1.18/src/dir_mem.c ncdu-1.19/src/dir_mem.c --- ncdu-1.18/src/dir_mem.c 2022-04-28 10:16:55.000000000 +0100 +++ ncdu-1.19/src/dir_mem.c 2023-02-12 07:40:53.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/dir_scan.c ncdu-1.19/src/dir_scan.c --- ncdu-1.18/src/dir_scan.c 2022-04-28 10:16:57.000000000 +0100 +++ ncdu-1.19/src/dir_scan.c 2023-02-12 07:40:56.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -51,6 +51,7 @@ int dir_scan_smfs; /* Stay on the same filesystem */ +int exclude_kernfs; /* Exclude Linux pseudo filesystems */ static uint64_t curdev; /* current device we're scanning on */ @@ -61,7 +62,6 @@ #if HAVE_LINUX_MAGIC_H && HAVE_SYS_STATFS_H && HAVE_STATFS -int exclude_kernfs; /* Exclude Linux pseudo filesystems */ static int is_kernfs(unsigned long type) { if( diff -Nru ncdu-1.18/src/exclude.c ncdu-1.19/src/exclude.c --- ncdu-1.18/src/exclude.c 2022-11-06 11:55:21.000000000 +0000 +++ ncdu-1.19/src/exclude.c 2023-02-12 07:41:03.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/exclude.h ncdu-1.19/src/exclude.h --- ncdu-1.18/src/exclude.h 2022-04-28 10:17:05.000000000 +0100 +++ ncdu-1.19/src/exclude.h 2023-02-12 07:41:05.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/global.h ncdu-1.19/src/global.h --- ncdu-1.18/src/global.h 2022-11-30 10:26:10.000000000 +0000 +++ ncdu-1.19/src/global.h 2023-02-12 07:41:07.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/help.c ncdu-1.19/src/help.c --- ncdu-1.18/src/help.c 2022-11-05 09:51:30.000000000 +0000 +++ ncdu-1.19/src/help.c 2023-02-12 07:41:09.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/help.h ncdu-1.19/src/help.h --- ncdu-1.18/src/help.h 2022-04-28 10:17:13.000000000 +0100 +++ ncdu-1.19/src/help.h 2023-02-12 07:41:11.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/main.c ncdu-1.19/src/main.c --- ncdu-1.18/src/main.c 2022-11-30 10:30:55.000000000 +0000 +++ ncdu-1.19/src/main.c 2023-09-11 08:16:05.000000000 +0100 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -219,6 +219,8 @@ else if(OPT("--hide-percent")) graph &= 1; else if(OPT("--group-directories-first")) dirlist_sort_df = 1; else if(OPT("--no-group-directories-first")) dirlist_sort_df = 0; + else if(OPT("--enable-natsort")) dirlist_natsort = 1; + else if(OPT("--disable-natsort")) dirlist_natsort = 0; else if(OPT("--sort")) { arg = ARG; tmp = strrchr(arg, '-'); @@ -252,7 +254,7 @@ else if(OPT("-L") || OPT("--follow-symlinks")) follow_symlinks = 1; else if(OPT("--no-follow-symlinks")) follow_symlinks = 0; else if(OPT("--exclude")) exclude_add(ARG); - else if(OPT("-X") || OPT("--exclude-form")) { + else if(OPT("-X") || OPT("--exclude-from")) { arg = ARG; if(exclude_addfile(arg)) die("Can't open %s: %s\n", arg, strerror(errno)); } else if(OPT("--exclude-caches")) cachedir_tags = 1; diff -Nru ncdu-1.18/src/path.c ncdu-1.19/src/path.c --- ncdu-1.18/src/path.c 2022-04-28 10:17:17.000000000 +0100 +++ ncdu-1.19/src/path.c 2023-02-12 07:41:16.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/path.h ncdu-1.19/src/path.h --- ncdu-1.18/src/path.h 2022-04-28 10:17:20.000000000 +0100 +++ ncdu-1.19/src/path.h 2023-02-12 07:41:18.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/quit.c ncdu-1.19/src/quit.c --- ncdu-1.18/src/quit.c 2022-11-05 09:51:55.000000000 +0000 +++ ncdu-1.19/src/quit.c 2023-02-12 07:41:20.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2015-2022 Yoran Heling + Copyright (c) 2015-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/quit.h ncdu-1.19/src/quit.h --- ncdu-1.18/src/quit.h 2022-04-28 10:17:26.000000000 +0100 +++ ncdu-1.19/src/quit.h 2023-02-12 07:41:24.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2015-2022 Yoran Heling + Copyright (c) 2015-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/shell.c ncdu-1.19/src/shell.c --- ncdu-1.18/src/shell.c 2022-11-05 09:51:47.000000000 +0000 +++ ncdu-1.19/src/shell.c 2023-02-12 07:41:26.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Shell support: Copyright (c) 2014 Thomas Jarosch Permission is hereby granted, free of charge, to any person obtaining diff -Nru ncdu-1.18/src/shell.h ncdu-1.19/src/shell.h --- ncdu-1.18/src/shell.h 2022-04-28 10:17:30.000000000 +0100 +++ ncdu-1.19/src/shell.h 2023-02-12 07:41:28.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Shell support: Copyright (c) 2014 Thomas Jarosch Permission is hereby granted, free of charge, to any person obtaining diff -Nru ncdu-1.18/src/util.c ncdu-1.19/src/util.c --- ncdu-1.18/src/util.c 2022-11-06 11:55:01.000000000 +0000 +++ ncdu-1.19/src/util.c 2023-02-12 07:41:31.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff -Nru ncdu-1.18/src/util.h ncdu-1.19/src/util.h --- ncdu-1.18/src/util.h 2022-11-06 11:55:09.000000000 +0000 +++ ncdu-1.19/src/util.h 2023-02-12 07:41:33.000000000 +0000 @@ -1,6 +1,6 @@ /* ncdu - NCurses Disk Usage - Copyright (c) 2007-2022 Yoran Heling + Copyright (c) 2007-2023 Yoran Heling Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the
signature.asc
Description: PGP signature
