From 6cff03b95d91ecd03c0c112fb7dbba77712b21fe Mon Sep 17 00:00:00 2001
From: yorhel <yorhel@ce56bc8d-f834-0410-b703-f827bd498a76>
Date: Sun, 22 Jul 2007 13:43:24 +0000
Subject: [PATCH] Small bugs fixed related to the exclude feature
git-svn-id: svn://blicky.net/ncdu/trunk@4 ce56bc8d-f834-0410-b703-f827bd498a76
---
configure | 8 ++++----
configure.in | 4 ++--
src/browser.c | 12 +++++++-----
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index 59adc35..950ec65 100755
--- a/configure
+++ b/configure
@@ -579,7 +579,6 @@ PACKAGE_STRING='ncdu 1.2'
PACKAGE_BUGREPORT='projects@yorhel.nl'
ac_unique_file="src/ncdu.h"
-ac_default_prefix=/usr
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1730,7 +1729,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers config.h"
-
am__api_version='1.10'
ac_aux_dir=
@@ -4581,7 +4579,8 @@ done
-for ac_header in limits.h stdlib.h string.h sys/time.h unistd.h
+
+for ac_header in limits.h stdlib.h string.h sys/time.h unistd.h fnmatch.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -5971,7 +5970,8 @@ fi
-for ac_func in getcwd gettimeofday memset
+
+for ac_func in getcwd gettimeofday memset fnmatch
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/configure.in b/configure.in
index f39ce29..8184a65 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ AC_CHECK_LIB(menu, new_menu)
# Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
-AC_CHECK_HEADERS([limits.h stdlib.h string.h sys/time.h unistd.h])
+AC_CHECK_HEADERS([limits.h stdlib.h string.h sys/time.h unistd.h fnmatch.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@ -31,7 +31,7 @@ AC_FUNC_CLOSEDIR_VOID
AC_FUNC_LSTAT
AC_FUNC_MALLOC
AC_FUNC_STAT
-AC_CHECK_FUNCS([getcwd gettimeofday memset])
+AC_CHECK_FUNCS([getcwd gettimeofday memset fnmatch])
#AC_CONFIG_FILES([Makefile ])
AC_OUTPUT([Makefile src/Makefile doc/Makefile])
diff --git a/src/browser.c b/src/browser.c
index d2611e2..8be5d41 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -284,14 +284,16 @@ int helpScreen(void) {
mvwaddch(hlp, 6, 4, '!');
mvwaddch(hlp, 7, 4, '.');
mvwaddch(hlp, 8, 4, '>');
- mvwaddch(hlp, 9, 4, '@');
- mvwaddch(hlp,10, 4, 'e');
+ mvwaddch(hlp, 9, 4, '<');
+ mvwaddch(hlp,10, 4, '@');
+ mvwaddch(hlp,11, 4, 'e');
wattroff(hlp, A_BOLD);
mvwaddstr(hlp, 6, 7, "An error occured while reading this directory");
mvwaddstr(hlp, 7, 7, "An error occured while reading a subdirectory");
- mvwaddstr(hlp, 8, 7, "Directory was on an other filesystem");
- mvwaddstr(hlp, 9, 7, "This is not a file nor a dir (symlink, socket, ...)");
- mvwaddstr(hlp,10, 7, "Empty directory");
+ mvwaddstr(hlp, 8, 7, "File or directory is excluded from the statistics");
+ mvwaddstr(hlp, 9, 7, "Directory was on an other filesystem");
+ mvwaddstr(hlp,10, 7, "This is not a file nor a dir (symlink, socket, ...)");
+ mvwaddstr(hlp,11, 7, "Empty directory");
break;
case 3:
/* Indeed, too much spare time */
--
GitLab