[pkgsrc/trunk]: pkgsrc/sysutils/mc Fix the undocumented find_ignore_dirs opti...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/52ea476a1ee1
branches:  trunk
changeset: 568645:52ea476a1ee1
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Dec 16 15:29:48 2009 +0000

description:
Fix the undocumented find_ignore_dirs option. Bump revision.

diffstat:

 sysutils/mc/Makefile         |   4 +-
 sysutils/mc/distinfo         |   3 +-
 sysutils/mc/patches/patch-ad |  62 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 3 deletions(-)

diffs (94 lines):

diff -r 1b53dc44ed75 -r 52ea476a1ee1 sysutils/mc/Makefile
--- a/sysutils/mc/Makefile      Wed Dec 16 15:27:33 2009 +0000
+++ b/sysutils/mc/Makefile      Wed Dec 16 15:29:48 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2009/06/14 21:28:47 joerg Exp $
+# $NetBSD: Makefile,v 1.75 2009/12/16 15:29:48 joerg Exp $
 
 DISTNAME=      mc-4.6.1
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    sysutils
 MASTER_SITES=  http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/ \
                ${MASTER_SITE_SUNSITE:=utils/file/managers/mc/}
diff -r 1b53dc44ed75 -r 52ea476a1ee1 sysutils/mc/distinfo
--- a/sysutils/mc/distinfo      Wed Dec 16 15:27:33 2009 +0000
+++ b/sysutils/mc/distinfo      Wed Dec 16 15:29:48 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2008/02/14 12:26:56 drochner Exp $
+$NetBSD: distinfo,v 1.18 2009/12/16 15:29:48 joerg Exp $
 
 SHA1 (mc-4.6.1.tar.gz) = 92be0802143245e0fb7e3847d70da614cad7d5fb
 RMD160 (mc-4.6.1.tar.gz) = d565ee95a8916d73fad5e0defeb9f2f57e50962b
@@ -6,4 +6,5 @@
 SHA1 (patch-aa) = 7168617908acb8aead0109308845513316ff3f18
 SHA1 (patch-ab) = 11677a3029ee2669d8a74a47188cff728052f408
 SHA1 (patch-ac) = 9d35fbfb73a3c5b9bc7dff604599d63069fc62ab
+SHA1 (patch-ad) = 78e0c111ca92f55701a0963b049b1dfef9f06cf1
 SHA1 (patch-su) = adad37f777fd2db905108fbd8d1b1a139cf1352a
diff -r 1b53dc44ed75 -r 52ea476a1ee1 sysutils/mc/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/mc/patches/patch-ad      Wed Dec 16 15:29:48 2009 +0000
@@ -0,0 +1,62 @@
+$NetBSD: patch-ad,v 1.9 2009/12/16 15:29:48 joerg Exp $
+
+--- src/find.c.orig    2005-05-27 14:19:18.000000000 +0000
++++ src/find.c
+@@ -606,18 +606,7 @@ do_search (struct Dlg_head *h)
+                   stop_idle (h);
+                   return 0;
+               }
+-              if (find_ignore_dirs){
+-                    int found;
+-                  char *temp_dir = g_strconcat (":", tmp, ":", (char *) NULL);
+-
+-                    found = strstr (find_ignore_dirs, temp_dir) != 0;
+-                    g_free (temp_dir);
+-                  if (found)
+-                      g_free (tmp);
+-                  else
+-                      break;
+-              } else
+-                  break;
++              break;
+           } 
+ 
+           g_free (directory);
+@@ -652,14 +641,30 @@ do_search (struct Dlg_head *h)
+       return 1;
+     }
+ 
+-    if (subdirs_left && directory) { /* Can directory be NULL ? */
+-      char *tmp_name = concat_dir_and_file (directory, dp->d_name);
+-      if (!mc_lstat (tmp_name, &tmp_stat)
+-          && S_ISDIR (tmp_stat.st_mode)) {
+-          push_directory (tmp_name);
+-          subdirs_left--;
++    if (directory) { /* Can directory be NULL ? */
++      char *tmp_name;
++      if (find_ignore_dirs){
++          int found;
++
++          tmp_name = g_strconcat (":", dp->d_name, ":", (char *) NULL);
++
++            found = strstr (find_ignore_dirs, tmp_name) != 0;
++            g_free (tmp_name);
++          if (found) {
++              dp = mc_readdir (dirp);
++              return 1;
++          }
++      }
++
++      if (subdirs_left) {
++          tmp_name = concat_dir_and_file (directory, dp->d_name);
++          if (!mc_lstat (tmp_name, &tmp_stat)
++              && S_ISDIR (tmp_stat.st_mode)) {
++              push_directory (tmp_name);
++              subdirs_left--;
++          }
++          g_free (tmp_name);
+       }
+-      g_free (tmp_name);
+     }
+ 
+     if (regexp_match (find_pattern, dp->d_name, match_file)){