From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 878D6416467 for ; Mon, 9 Apr 2012 03:18:45 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.299 X-Spam-Level: X-Spam-Status: No, score=-2.299 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3, UNPARSEABLE_RELAY=0.001] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rBOA6stHhMgT for ; Mon, 9 Apr 2012 03:18:44 -0700 (PDT) Received: from rcsinet14.oracle.com (rcsinet14.oracle.com [148.87.113.126]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 745E5416464 for ; Mon, 9 Apr 2012 03:18:44 -0700 (PDT) Received: from rcsinet15.oracle.com (rcsinet15.oracle.com [148.87.113.117]) by rcsinet14.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q39AGbrP026349 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 9 Apr 2012 10:16:37 GMT Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q39AIfQn010126 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 9 Apr 2012 10:18:42 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q39AIe1q015673 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 9 Apr 2012 10:18:41 GMT Received: from abhmt120.oracle.com (abhmt120.oracle.com [141.146.116.72]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q39AIeta008108; Mon, 9 Apr 2012 05:18:40 -0500 Received: from pub.czech.sun.com (/10.163.20.32) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 09 Apr 2012 03:18:40 -0700 From: Vladimir.Marek@oracle.com To: notmuch@notmuchmail.org Subject: [PATCH 2/4] dirent->d_type not available on Soalris Date: Mon, 9 Apr 2012 12:17:43 +0200 Message-Id: <1333966665-10469-3-git-send-email-Vladimir.Marek@oracle.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1333966665-10469-1-git-send-email-Vladimir.Marek@oracle.com> References: <1333966665-10469-1-git-send-email-Vladimir.Marek@oracle.com> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] X-CT-RefId: str=0001.0A090201.4F82B782.00BB,ss=1,re=0.000,fgs=0 Cc: Vladimir Marek X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2012 10:18:45 -0000 From: Vladimir Marek The inspiration was taken from similar issue in mutt: http://does-not-exist.org/mail-archives/mutt-dev/msg11290.html Signed-off-by: Vladimir Marek --- notmuch-new.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/notmuch-new.c b/notmuch-new.c index 4f13535..20bc580 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -21,6 +21,7 @@ #include "notmuch-client.h" #include +#include typedef struct _filename_node { char *filename; @@ -165,9 +166,12 @@ static int _entries_resemble_maildir (struct dirent **entries, int count) { int i, found = 0; + struct stat statbuf; for (i = 0; i < count; i++) { - if (entries[i]->d_type != DT_DIR && entries[i]->d_type != DT_UNKNOWN) + if (stat(entries[i]->d_name, &statbuf) == -1) + continue; + if (! S_ISDIR(statbuf.st_mode)) continue; if (strcmp(entries[i]->d_name, "new") == 0 || @@ -258,6 +262,7 @@ add_files_recursive (notmuch_database_t *notmuch, struct stat st; notmuch_bool_t is_maildir, new_directory; const char **tag; + struct stat statbuf; if (stat (path, &st)) { fprintf (stderr, "Error reading directory %s: %s\n", @@ -321,6 +326,9 @@ add_files_recursive (notmuch_database_t *notmuch, entry = fs_entries[i]; + if (stat(entry->d_name, &statbuf) == -1) + continue; + /* We only want to descend into directories. * But symlinks can be to directories too, of course. * @@ -328,9 +336,8 @@ add_files_recursive (notmuch_database_t *notmuch, * scandir results, then it might be a directory (and if not, * then we'll stat and return immediately in the next level of * recursion). */ - if (entry->d_type != DT_DIR && - entry->d_type != DT_LNK && - entry->d_type != DT_UNKNOWN) + if (!(statbuf.st_mode & S_IFDIR) && + !(statbuf.st_mode & S_IFLNK)) { continue; } @@ -427,7 +434,7 @@ add_files_recursive (notmuch_database_t *notmuch, * * In either case, a stat does the trick. */ - if (entry->d_type == DT_LNK || entry->d_type == DT_UNKNOWN) { + if (stat(entry->d_name, &statbuf) == -1 || statbuf.st_mode & S_IFLNK) { int err; next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name); @@ -443,7 +450,7 @@ add_files_recursive (notmuch_database_t *notmuch, if (! S_ISREG (st.st_mode)) continue; - } else if (entry->d_type != DT_REG) { + } else if ( statbuf.st_mode & S_IFREG) { continue; } -- 1.7.3.2