fix implicit listing of Maildir INBOX under Path

commit acd6b4b0 ("simplify/fix recursive maildir listing") argued that
listing INBOX when it is encountered while listing Path would be
unnecessary, as the caller would list it separately anyway if requested.
however, it is actually documented that Patterns will implicitly match
INBOX nested into Path. so revert that commit.

REFMAIL: 20240818002409.4c918eb4@inari

debian/changelog

@@ -181,7 +181,7 @@ isync (1.0.3-1) experimental; urgency=low
     - It also supports unflagging messages. (Closes: #111286)
     - IMAP commands are sent asynchronously. (Closes: #226222)
   * Kill the old debconf question about upgrades from pre-0.8 versions.
-  * Use the (now obsolete) swedish and portugese translations anyway.
+  * Use the (now obsolete) swedish and portuguese translations anyway.
     (Closes: #337771, #378891)
   * New debconf note that warns about upgrades from pre-1.0 versions.
   * Add a build dependency on po-debconf.
@@ -273,7 +273,7 @@ isync (0.9.1-1) unstable; urgency=low
   * Remove sample.isyncrc from debian/docs: no need to have it both as a
     doc and as an example.
   * Move package from section non-US/main (?) to mail. (Closes: #154216)
-  * Update versionned build-dependency on debhelper to >= 4.1.16.
+  * Update versioned build-dependency on debhelper to >= 4.1.16.
   * Bump Standards-Version to 3.6.1. (No change required.)
 
  -- Nicolas Boullis <nboullis@debian.org>  Tue, 14 Oct 2003 22:02:20 +0200
@@ -311,7 +311,7 @@ isync (0.8-1) unstable; urgency=low
     duplicate messages on your IMAP server.
 
   * Has better support for uploading locally added messages. Closes: #120272
-  * Added a debconf queston with some info about this that lets you abort the
+  * Added a debconf question with some info about this that lets you abort the
     upgrade.
   * Added NEWS.Debian with same info.
   * New maintainer.

src/driver.h

@@ -271,7 +271,7 @@ struct driver {
 
 	/* Add/remove the named flags to/from the given message. The message may be either
 	 * a pre-fetched one (in which case the in-memory representation is updated),
-	 * or it may be identifed by UID only.
+	 * or it may be identified by UID only.
 	 * The operation may be delayed until commit_cmds() is called. */
 	void (*set_msg_flags)( store_t *ctx, message_t *msg, uint uid, int add, int del,
 	                       void (*cb)( int sts, void *aux ), void *aux );

src/drv_maildir.c

@@ -372,6 +372,8 @@ maildir_list_maildirpp( maildir_store_t *ctx, int flags, const char *inbox )
 	return 0;
 }
 
+static int maildir_list_inbox( maildir_store_t *ctx );
+
 static int
 maildir_list_recurse( maildir_store_t *ctx, int isBox,
                       const char *inbox, uint inboxLen,
@@ -422,6 +424,10 @@ maildir_list_recurse( maildir_store_t *ctx, int isBox,
 		pl += pathLen;
 		if (inbox && equals( path, pl, inbox, inboxLen )) {
 			// Inbox nested into Path.
+			if (maildir_list_inbox( ctx ) < 0) {
+				closedir( dir );
+				return -1;
+			}
 		} else {
 			if (style == SUB_LEGACY) {
 				if (*ent == '.') {

src/main_sync.c

@@ -532,7 +532,7 @@ store_connected( int sts, void *aux )
 					int bufl = snprintf( buf, sizeof(buf), "%s%s", nz( mvars->chan->boxes[t], "" ), pat );
 					int flags = 0;
 					// Partial matches like "INB*" or even "*" are not considered,
-					// except implicity when the INBOX lives under Path.
+					// except implicitly when the INBOX lives under Path.
 					if (starts_with( buf, bufl, "INBOX", 5 )) {
 						char c = buf[5];
 						if (!c) {

src/mbsync.1.in

@@ -111,7 +111,7 @@ Enable debugging categories:
 .br
 \fBs\fR, \fBsync\fR - print synchronization debug info
 .in -4
-All categories except \fBcrash\fR implictly enable \fIverbose\fR mode.
+All categories except \fBcrash\fR implicitly enable \fIverbose\fR mode.
 Without category specification, all categories except net-all are enabled.
 .TP
 \fB-q\fR, \fB--quiet\fR
@@ -368,7 +368,7 @@ See \fBUserCmd\fR above for details.
 Whether to use the macOS Keychain to obtain the password.
 (Default: \fBno\fR)
 .IP
-The neccessary keychain item can be created this way:
+The necessary keychain item can be created this way:
 .RS
 .IP
 .nh

src/mbsyncrc.sample

@@ -73,12 +73,12 @@ Inbox ~/Mail/w0rk_InBoX
 Channel personal-joined
 Far :personal:
 Near :local-personal:
-Paterns *
+Patterns *
 
 Channel work-joined
 Far :work:
 Near :local-work:
-Paterns *
+Patterns *
 
 Group joined personal-joined work-joined
 

src/run-tests.pl

@@ -36,7 +36,7 @@ if (!-d "tmp") {
   my $tdir = tempdir();
   symlink $tdir, "tmp" or die "Cannot symlink temp directory: $!\n";
 }
-chdir "tmp" or die "Cannot enter temp direcory.\n";
+chdir "tmp" or die "Cannot enter temp directory.\n";
 
 use enum qw(:=1 A..Z);
 sub mn($) { my ($n) = @_; $n == 0 ? "0" : chr(64 + $n) }
@@ -959,7 +959,7 @@ sub test($$$$;$)
 #     # => create in trash; deletion may follow
 #     | => use zero UID for state modification, even if msg exists; cmd may follow
 #     & => use zero UID for state identification, even if message exists
-#     &n => use UID of n'th occurence of subject for state id; command may follow
+#     &n => use UID of n'th occurrence of subject for state id; command may follow
 #   Special flag suffixes:
 #     * => big
 #     ? => placeholder

src/sync.c

@@ -431,7 +431,7 @@ box_confirmed2( sync_vars_t *svars, int t )
 					/* This can legitimately happen if a deletion propagation was interrupted.
 					 * We have no place to record this transaction, so we just assume it.
 					 * Of course this bears the danger of clearing the state if both mailboxes
-					 * temorarily cannot be opened for some weird reason (while the stores can). */
+					 * temporarily cannot be opened for some weird reason (while the stores can). */
 					delete_state( svars );
 				}
 			  done:
@@ -440,12 +440,12 @@ box_confirmed2( sync_vars_t *svars, int t )
 			}
 			if (svars->existing) {
 				if (!(svars->chan->ops[t^1] & OP_REMOVE)) {
-					error( "Error: channel %s: %s box %s cannot be opened.\n",
+					error( "Error: channel %s: %s box %s cannot be opened anymore.\n",
 					       svars->chan->name, str_fn[t], svars->orig_name[t] );
 					goto bail;
 				}
 				if (svars->drv[t^1]->confirm_box_empty( svars->ctx[t^1] ) != DRV_OK) {
-					warn( "Warning: channel %s: %s box %s cannot be opened and %s box %s is not empty.\n",
+					warn( "Warning: channel %s: %s box %s cannot be opened anymore, and %s box %s is not empty.\n",
 					      svars->chan->name, str_fn[t], svars->orig_name[t], str_fn[t^1], svars->orig_name[t^1] );
 					goto done;
 				}