From dd75f419eeaa22b9fd09119e00b3f729c0d0ad29 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Tue, 8 May 2012 18:20:40 +2000 Subject: [PATCH] [PATCH v2 2/2] new: Centralize file type stat-ing logic --- 63/b90bc460f5ae7dae1b02ed7ca3656962073221 | 254 ++++++++++++++++++++++ 1 file changed, 254 insertions(+) create mode 100644 63/b90bc460f5ae7dae1b02ed7ca3656962073221 diff --git a/63/b90bc460f5ae7dae1b02ed7ca3656962073221 b/63/b90bc460f5ae7dae1b02ed7ca3656962073221 new file mode 100644 index 000000000..4f6bf1512 --- /dev/null +++ b/63/b90bc460f5ae7dae1b02ed7ca3656962073221 @@ -0,0 +1,254 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1B1A9431FD8 + for ; Mon, 7 May 2012 15:20:49 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 pI5an2aEpY-n for ; + Mon, 7 May 2012 15:20:48 -0700 (PDT) +Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU + [18.7.68.34]) + by olra.theworths.org (Postfix) with ESMTP id 26825431FAE + for ; Mon, 7 May 2012 15:20:48 -0700 (PDT) +X-AuditID: 12074422-b7fd66d0000008f9-e1-4fa84abfe988 +Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) + by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP + id 0D.2D.02297.FBA48AF4; Mon, 7 May 2012 18:20:47 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q47MKld0013329; + Mon, 7 May 2012 18:20:47 -0400 +Received: from drake.mit.edu (26-4-166.dynamic.csail.mit.edu [18.26.4.166]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q47MKkvs006042 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Mon, 7 May 2012 18:20:46 -0400 (EDT) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1SRWIP-0000Ja-UO; Mon, 07 May 2012 18:20:45 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 2/2] new: Centralize file type stat-ing logic +Date: Mon, 7 May 2012 18:20:40 -0400 +Message-Id: <1336429240-1114-3-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1336429240-1114-1-git-send-email-amdragon@mit.edu> +References: <1336414186-15293-1-git-send-email-amdragon@mit.edu> + <1336429240-1114-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixG6norvfa4W/warpihbXb85ktphxfheL + A5PHs1W3mD2WHf3JGMAUxWWTkpqTWZZapG+XwJXx/eUGtoInRhV3l91mbGDcrt7FyMkhIWAi + ce7ZdxYIW0ziwr31bF2MXBxCAvsYJebMWwLlrGeUaPp4H8o5xiSxb99rZghnPqPEj64GRpB+ + NgENiW37l4PZIgLSEjvvzmYFsZkFPCUOfJsGFhcWcJD4/OMAM4jNIqAqcXH9OSCbg4NXwF7i + 1zE/iDPkJZ7e72MDCXMClb+/ZA8SFhIok3h7+R/TBEb+BYwMqxhlU3KrdHMTM3OKU5N1i5MT + 8/JSi3RN9XIzS/RSU0o3MYIDyUVpB+PPg0qHGAU4GJV4eJVeLPcXYk0sK67MPcQoycGkJMp7 + 0nOFvxBfUn5KZUZicUZ8UWlOavEhRgkOZiUR3jYxoBxvSmJlVWpRPkxKmoNFSZxXXeudn5BA + emJJanZqakFqEUxWhoNDSYL3HMhQwaLU9NSKtMycEoQ0EwcnyHAeoOFHQWp4iwsSc4sz0yHy + pxgVpcR5+0ASAiCJjNI8uF5YpL9iFAd6RZg3D6SKB5gk4LpfAQ1mAhq8+dkykMEliQgpqQbG + Vf/7p7BHnHmRcSpE+O6T/XdXMFj/2by46pvi2ZYit7KskpkS2srrb56aeMGo98TG/4ydxu1P + P8fZcetKXl18dT1D8g9pblXPV5cb909+7KbWviX/U/z3P+KZnbO/3xboe7DGX+zCfrl5G1jL + mVbc2/fjj1Xwwd/Pvgs+j+wvX6h03bK83Px8iRJLcUaioRZzUXEiAJANzZHPAgAA +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, 07 May 2012 22:20:49 -0000 + +This moves our logic to get a file's type into one function. This has +several benefits: we can support OSes and file systems that do not +provide dirent.d_type or always return DT_UNKNOWN, complex +symlink-handling logic has been replaced by a simple stat fall-through +in one place, and the error message for un-stat-able file is more +accurate (previously, the error always mentioned directories, even +though a broken symlink is not a directory). +--- + notmuch-new.c | 103 +++++++++++++++++++++++++++++++++++---------------------- + test/new | 2 +- + 2 files changed, 64 insertions(+), 41 deletions(-) + +diff --git a/notmuch-new.c b/notmuch-new.c +index cb720cc..8955677 100644 +--- a/notmuch-new.c ++++ b/notmuch-new.c +@@ -154,6 +154,48 @@ dirent_sort_strcmp_name (const struct dirent **a, const struct dirent **b) + return strcmp ((*a)->d_name, (*b)->d_name); + } + ++/* Return the type of a directory entry relative to path as a stat(2) ++ * mode. Like stat, this follows symlinks. Returns -1 and sets errno ++ * if the file's type cannot be determined (which includes dangling ++ * symlinks). ++ */ ++static int ++dirent_type (const char *path, const struct dirent *entry) ++{ ++ struct stat statbuf; ++ char *abspath; ++ int err, saved_errno; ++ ++#ifdef _DIRENT_HAVE_D_TYPE ++ /* Mapping from d_type to stat mode_t. We omit DT_LNK so that ++ * we'll fall through to stat and get the real file type. */ ++ static const mode_t modes[] = { ++ [DT_BLK] = S_IFBLK, ++ [DT_CHR] = S_IFCHR, ++ [DT_DIR] = S_IFDIR, ++ [DT_FIFO] = S_IFIFO, ++ [DT_REG] = S_IFREG, ++ [DT_SOCK] = S_IFSOCK ++ }; ++ if (entry->d_type < ARRAY_SIZE(modes) && modes[entry->d_type]) ++ return modes[entry->d_type]; ++#endif ++ ++ abspath = talloc_asprintf (NULL, "%s/%s", path, entry->d_name); ++ if (!abspath) { ++ errno = ENOMEM; ++ return -1; ++ } ++ err = stat(abspath, &statbuf); ++ saved_errno = errno; ++ talloc_free (abspath); ++ if (err < 0) { ++ errno = saved_errno; ++ return -1; ++ } ++ return statbuf.st_mode & S_IFMT; ++} ++ + /* Test if the directory looks like a Maildir directory. + * + * Search through the array of directory entries to see if we can find all +@@ -162,12 +204,12 @@ dirent_sort_strcmp_name (const struct dirent **a, const struct dirent **b) + * Return 1 if the directory looks like a Maildir and 0 otherwise. + */ + static int +-_entries_resemble_maildir (struct dirent **entries, int count) ++_entries_resemble_maildir (const char *path, struct dirent **entries, int count) + { + int i, found = 0; + + for (i = 0; i < count; i++) { +- if (entries[i]->d_type != DT_DIR && entries[i]->d_type != DT_UNKNOWN) ++ if (dirent_type (path, entries[i]) != S_IFDIR) + continue; + + if (strcmp(entries[i]->d_name, "new") == 0 || +@@ -250,7 +292,7 @@ add_files_recursive (notmuch_database_t *notmuch, + notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS; + notmuch_message_t *message = NULL; + struct dirent **fs_entries = NULL; +- int i, num_fs_entries; ++ int i, num_fs_entries, entry_type; + notmuch_directory_t *directory; + notmuch_filenames_t *db_files = NULL; + notmuch_filenames_t *db_subdirs = NULL; +@@ -317,7 +359,7 @@ add_files_recursive (notmuch_database_t *notmuch, + } + + /* Pass 1: Recurse into all sub-directories. */ +- is_maildir = _entries_resemble_maildir (fs_entries, num_fs_entries); ++ is_maildir = _entries_resemble_maildir (path, fs_entries, num_fs_entries); + + for (i = 0; i < num_fs_entries; i++) { + if (interrupted) +@@ -325,17 +367,16 @@ add_files_recursive (notmuch_database_t *notmuch, + + entry = fs_entries[i]; + +- /* We only want to descend into directories. +- * But symlinks can be to directories too, of course. +- * +- * And if the filesystem doesn't tell us the file type in the +- * 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) +- { ++ /* We only want to descend into directories (and symlinks to ++ * directories). */ ++ entry_type = dirent_type (path, entry); ++ if (entry_type == -1) { ++ /* Be pessimistic, e.g. so we don't lose lots of mail just ++ * because a user broke a symlink. */ ++ fprintf (stderr, "Error reading file %s/%s: %s\n", ++ path, entry->d_name, strerror (errno)); ++ return NOTMUCH_STATUS_FILE_ERROR; ++ } else if (entry_type != S_IFDIR) { + continue; + } + +@@ -425,31 +466,13 @@ add_files_recursive (notmuch_database_t *notmuch, + notmuch_filenames_move_to_next (db_subdirs); + } + +- /* If we're looking at a symlink, we only want to add it if it +- * links to a regular file, (and not to a directory, say). +- * +- * Similarly, if the file is of unknown type (due to filesystem +- * limitations), then we also need to look closer. +- * +- * In either case, a stat does the trick. +- */ +- if (entry->d_type == DT_LNK || entry->d_type == DT_UNKNOWN) { +- int err; +- +- next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name); +- err = stat (next, &st); +- talloc_free (next); +- next = NULL; +- +- /* Don't emit an error for a link pointing nowhere, since +- * the directory-traversal pass will have already done +- * that. */ +- if (err) +- continue; +- +- if (! S_ISREG (st.st_mode)) +- continue; +- } else if (entry->d_type != DT_REG) { ++ /* Only add regular files (and symlinks to regular files). */ ++ entry_type = dirent_type (path, entry); ++ if (entry_type == -1) { ++ fprintf (stderr, "Error reading file %s/%s: %s\n", ++ path, entry->d_name, strerror (errno)); ++ return NOTMUCH_STATUS_FILE_ERROR; ++ } else if (entry_type != S_IFREG) { + continue; + } + +diff --git a/test/new b/test/new +index 26253db..e3900f5 100755 +--- a/test/new ++++ b/test/new +@@ -140,7 +140,7 @@ test_begin_subtest "Broken symlink aborts" + ln -s does-not-exist "${MAIL_DIR}/broken" + output=$(NOTMUCH_NEW 2>&1) + test_expect_equal "$output" \ +-"Error reading directory /run/shm/nm/tmp.new/mail/broken: No such file or directory ++"Error reading file /run/shm/nm/tmp.new/mail/broken: No such file or directory + Note: A fatal error was encountered: Something went wrong trying to read or write a file + No new mail." + rm "${MAIL_DIR}/broken" +-- +1.7.10 + -- 2.26.2