[PR PATCH] mdirs: add Maildir profile key

[PR PATCH] mdirs: add Maildir profile key

[meudwy]

[-- Attachment #1: Type: text/plain, Size: 415 bytes --]

There is a new pull request by meudwy against master on the mblaze repository

https://github.com/meudwy/mblaze mdirs-profile
https://github.com/leahneukirchen/mblaze/pull/245

mdirs: add Maildir profile key
When `mdirs` is executed without any arguments, look for the `Maildir` key in the profile and use that instead (if set).

A patch file from https://github.com/leahneukirchen/mblaze/pull/245.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mdirs-profile-245.patch --]
[-- Type: text/x-diff, Size: 3374 bytes --]

From 33fb6a11b62c320492dcfc97cd539561fcf3d52a Mon Sep 17 00:00:00 2001
From: Meudwy <meudwy@meudwy.uk>
Date: Tue, 25 Jul 2023 14:28:09 +0100
Subject: [PATCH] mdirs: add Maildir profile key

When `mdirs` is executed without any arguments, look for the `Maildir`
key in the profile and use that instead (if set).
---
 GNUmakefile          |  8 ++++----
 man/mblaze-profile.5 |  4 ++++
 man/mdirs.1          | 20 +++++++++++++++++++-
 mdirs.c              | 16 +++++++++++++---
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index c90e9383..357053bf 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -26,10 +26,10 @@ SCRIPT = mcolor mcom mless mmkdir mquote museragent
 all: $(ALL) museragent
 
 $(ALL) : % : %.o
-maddr magrep mdeliver mexport mflag mflow mgenmid mhdr mpick mscan msed mshow \
-  msort mthread : blaze822.o mymemmem.o mytimegm.o
-maddr magrep mdeliver mexport mflag mgenmid mhdr mlist mpick mscan msed mseq \
-  mshow msort mthread : seq.o slurp.o mystrverscmp.o
+maddr magrep mdeliver mdirs mexport mflag mflow mgenmid mhdr mpick mscan msed \
+  mshow msort mthread : blaze822.o mymemmem.o mytimegm.o
+maddr magrep mdeliver mdirs mexport mflag mgenmid mhdr mlist mpick mscan msed \
+  mseq mshow msort mthread : seq.o slurp.o mystrverscmp.o
 maddr magrep mflow mhdr mpick mscan mshow : rfc2047.o
 magrep mflow mhdr mshow : rfc2045.o
 mshow : filter.o safe_u8putstr.o rfc2231.o pipeto.o
diff --git a/man/mblaze-profile.5 b/man/mblaze-profile.5
index fe583095..d9aaad5c 100644
--- a/man/mblaze-profile.5
+++ b/man/mblaze-profile.5
@@ -49,6 +49,10 @@ The fully qualified domain name used for
 .Li Message\&-Id\&:
 generation in
 .Xr mgenmid 1 .
+.It Li Maildir\&:
+If set,
+.Xr mdirs 1
+will use this maildir when no directories are supplied.
 .It Li Outbox\&:
 If set,
 .Xr mcom 1
diff --git a/man/mdirs.1 b/man/mdirs.1
index 44ffae40..89885086 100644
--- a/man/mdirs.1
+++ b/man/mdirs.1
@@ -17,6 +17,14 @@ for maildir
 folders and prints them,
 separated by newlines.
 .Pp
+If
+.Ar dirs
+is not present then use 
+.Sq Li Maildir\&:
+from
+.Pa "${MBLAZE:-$HOME/.mblaze}/profile"
+.Pq if set .
+.Pp
 To
 .Nm ,
 a maildir folder is a directory containing
@@ -36,10 +44,20 @@ Print folders separated by a NUL character.
 .It Fl a
 Traverse into all subfolders, without considering the maildir++ name conventions.
 .El
+.Sh ENVIRONMENT
+.Bl -tag -width Ds
+.It Ev MBLAZE
+Directory containing mblaze configuration.
+.Po
+Default:
+.Pa $HOME/.mblaze
+.Pc
+.El
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
-.Xr find 1
+.Xr find 1 ,
+.Xr mblaze-profile 5
 .Sh AUTHORS
 .An Leah Neukirchen Aq Mt leah@vuxu.org
 .Sh LICENSE
diff --git a/mdirs.c b/mdirs.c
index 5f49906f..df8ea30b 100644
--- a/mdirs.c
+++ b/mdirs.c
@@ -5,6 +5,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "blaze822.h"
@@ -86,11 +87,20 @@ main(int argc, char *argv[])
 			exit(1);
 		}
 
-	if (argc == optind)
-		goto usage;
-
 	xpledge("stdio rpath", "");
 
+	if (argc == optind) {
+		char *f = blaze822_home_file("profile");
+		struct message *config = blaze822(f);
+		char *v;
+
+		if (config && (v = blaze822_hdr(config, "maildir"))) {
+			mdirs(v);
+			return 0;
+		}
+		goto usage;
+	}
+
 	char toplevel[PATH_MAX];
 	if (!getcwd(toplevel, sizeof toplevel)) {
 		perror("mdirs: getcwd");

Re: mdirs: add Maildir profile key

[meudwy]

[-- Attachment #1: Type: text/plain, Size: 395 bytes --]

New comment by meudwy on mblaze repository

https://github.com/leahneukirchen/mblaze/pull/245#issuecomment-1649892625

Comment:
I appreciate that this patch might not be useful for everyone's usage of mblaze, but for mine it reduces lots of keystrokes when constantly typing `mdirs ~/mail`.

It could also be improved to support tilde/variable expansion of directory name supplied in profile.

Re: mdirs: add Maildir profile key

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New comment by leahneukirchen on mblaze repository

https://github.com/leahneukirchen/mblaze/pull/245#issuecomment-1649920439

Comment:
Probably reasonable. Also bump manpage date.

Re: [PR PATCH] [Updated] mdirs: add Maildir profile key

[meudwy]

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]

There is an updated pull request by meudwy against master on the mblaze repository

https://github.com/meudwy/mblaze mdirs-profile
https://github.com/leahneukirchen/mblaze/pull/245

mdirs: add Maildir profile key
When `mdirs` is executed without any arguments, look for the `Maildir` key in the profile and use that instead (if set).

A patch file from https://github.com/leahneukirchen/mblaze/pull/245.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mdirs-profile-245.patch --]
[-- Type: text/x-diff, Size: 4109 bytes --]

From 66a74a5fe341648b390de333ade9f031f37f3ed1 Mon Sep 17 00:00:00 2001
From: Meudwy <meudwy@meudwy.uk>
Date: Tue, 25 Jul 2023 14:28:09 +0100
Subject: [PATCH] mdirs: add Maildir profile key

When `mdirs` is executed without any arguments, look for the `Maildir`
key in the profile and use that instead (if set).
---
 GNUmakefile          |  8 ++++----
 man/mblaze-profile.5 |  4 ++++
 man/mdirs.1          | 22 ++++++++++++++++++++--
 mdirs.c              | 41 ++++++++++++++++++++++++++++++++++++++---
 4 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 89cb7794..d3c081ed 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -26,10 +26,10 @@ SCRIPT = mcolor mcom mless mmkdir mquote museragent
 all: $(ALL) museragent
 
 $(ALL) : % : %.o
-maddr magrep mdeliver mexport mflag mflow mgenmid mhdr mpick mscan msed mshow \
-  msort mthread : blaze822.o mymemmem.o mytimegm.o
-maddr magrep mdeliver mexport mflag mgenmid mhdr minc mlist mpick mscan msed \
-  mseq mshow msort mthread : seq.o slurp.o mystrverscmp.o
+maddr magrep mdeliver mdirs mexport mflag mflow mgenmid mhdr mpick mscan msed \
+  mshow msort mthread : blaze822.o mymemmem.o mytimegm.o
+maddr magrep mdeliver mdirs mexport mflag mgenmid mhdr minc mlist mpick mscan \
+  msed mseq mshow msort mthread : seq.o slurp.o mystrverscmp.o
 maddr magrep mflow mhdr mpick mscan mshow : rfc2047.o
 magrep mflow mhdr mshow : rfc2045.o
 mshow : filter.o safe_u8putstr.o rfc2231.o pipeto.o
diff --git a/man/mblaze-profile.5 b/man/mblaze-profile.5
index fe583095..d9aaad5c 100644
--- a/man/mblaze-profile.5
+++ b/man/mblaze-profile.5
@@ -49,6 +49,10 @@ The fully qualified domain name used for
 .Li Message\&-Id\&:
 generation in
 .Xr mgenmid 1 .
+.It Li Maildir\&:
+If set,
+.Xr mdirs 1
+will use this maildir when no directories are supplied.
 .It Li Outbox\&:
 If set,
 .Xr mcom 1
diff --git a/man/mdirs.1 b/man/mdirs.1
index 44ffae40..2dd2ea1e 100644
--- a/man/mdirs.1
+++ b/man/mdirs.1
@@ -1,4 +1,4 @@
-.Dd January 22, 2020
+.Dd July 25, 2023
 .Dt MDIRS 1
 .Os
 .Sh NAME
@@ -17,6 +17,14 @@ for maildir
 folders and prints them,
 separated by newlines.
 .Pp
+If
+.Ar dirs
+is not present then use 
+.Sq Li Maildir\&:
+from
+.Pa "${MBLAZE:-$HOME/.mblaze}/profile"
+.Pq if set .
+.Pp
 To
 .Nm ,
 a maildir folder is a directory containing
@@ -36,10 +44,20 @@ Print folders separated by a NUL character.
 .It Fl a
 Traverse into all subfolders, without considering the maildir++ name conventions.
 .El
+.Sh ENVIRONMENT
+.Bl -tag -width Ds
+.It Ev MBLAZE
+Directory containing mblaze configuration.
+.Po
+Default:
+.Pa $HOME/.mblaze
+.Pc
+.El
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
-.Xr find 1
+.Xr find 1 ,
+.Xr mblaze-profile 5
 .Sh AUTHORS
 .An Leah Neukirchen Aq Mt leah@vuxu.org
 .Sh LICENSE
diff --git a/mdirs.c b/mdirs.c
index 5f49906f..a3cec16f 100644
--- a/mdirs.c
+++ b/mdirs.c
@@ -3,8 +3,10 @@
 
 #include <dirent.h>
 #include <limits.h>
+#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "blaze822.h"
@@ -72,6 +74,33 @@ mdirs(char *fpath)
 	closedir(dir);
 }
 
+char *
+profile_maildir()
+{
+	char *f = blaze822_home_file("profile");
+	struct message *config = blaze822(f);
+	char *maildir;
+	static char path[PATH_MAX];
+
+	if (!config)
+		return NULL;
+
+	if (!(maildir = blaze822_hdr(config, "maildir")))
+		return NULL;
+
+	if (strncmp(maildir, "~/", 2) == 0) {
+		const char *home = getenv("HOME");
+		if (!home) {
+			struct passwd *pw = getpwuid(getuid());
+			home = pw ? pw->pw_dir : "/dev/null/homeless";
+		}
+		snprintf(path, sizeof path, "%s/%s", home, &maildir[2]);
+		maildir = path;
+	}
+
+	return maildir;
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -86,11 +115,17 @@ main(int argc, char *argv[])
 			exit(1);
 		}
 
-	if (argc == optind)
-		goto usage;
-
 	xpledge("stdio rpath", "");
 
+	if (argc == optind) {
+		char *maildir = profile_maildir();
+		if (maildir) {
+			mdirs(maildir);
+			return 0;
+		}
+		goto usage;
+	}
+
 	char toplevel[PATH_MAX];
 	if (!getcwd(toplevel, sizeof toplevel)) {
 		perror("mdirs: getcwd");

Re: mdirs: add Maildir profile key

[meudwy]

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

New comment by meudwy on mblaze repository

https://github.com/leahneukirchen/mblaze/pull/245#issuecomment-1649972731

Comment:
Resolved conflicts and also added tilde expansion (to match `Drafts` and `Outbox` keys which also do the same).

Re: mdirs: add Maildir profile key

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

New comment by leahneukirchen on mblaze repository

https://github.com/leahneukirchen/mblaze/pull/245#issuecomment-1649992987

Comment:
two minor style nits, the codebase generally uses 0 instead of `NULL` and `maildir+2` instead of `&maildir[2]`.

Re: [PR PATCH] [Updated] mdirs: add Maildir profile key

[meudwy]

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]

There is an updated pull request by meudwy against master on the mblaze repository

https://github.com/meudwy/mblaze mdirs-profile
https://github.com/leahneukirchen/mblaze/pull/245

mdirs: add Maildir profile key
When `mdirs` is executed without any arguments, look for the `Maildir` key in the profile and use that instead (if set).

A patch file from https://github.com/leahneukirchen/mblaze/pull/245.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mdirs-profile-245.patch --]
[-- Type: text/x-diff, Size: 4101 bytes --]

From a00d35acc67bb0f2edee48b3a1e37ebc30a029e2 Mon Sep 17 00:00:00 2001
From: Meudwy <meudwy@meudwy.uk>
Date: Tue, 25 Jul 2023 14:28:09 +0100
Subject: [PATCH] mdirs: add Maildir profile key

When `mdirs` is executed without any arguments, look for the `Maildir`
key in the profile and use that instead (if set).
---
 GNUmakefile          |  8 ++++----
 man/mblaze-profile.5 |  4 ++++
 man/mdirs.1          | 22 ++++++++++++++++++++--
 mdirs.c              | 41 ++++++++++++++++++++++++++++++++++++++---
 4 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 89cb7794..d3c081ed 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -26,10 +26,10 @@ SCRIPT = mcolor mcom mless mmkdir mquote museragent
 all: $(ALL) museragent
 
 $(ALL) : % : %.o
-maddr magrep mdeliver mexport mflag mflow mgenmid mhdr mpick mscan msed mshow \
-  msort mthread : blaze822.o mymemmem.o mytimegm.o
-maddr magrep mdeliver mexport mflag mgenmid mhdr minc mlist mpick mscan msed \
-  mseq mshow msort mthread : seq.o slurp.o mystrverscmp.o
+maddr magrep mdeliver mdirs mexport mflag mflow mgenmid mhdr mpick mscan msed \
+  mshow msort mthread : blaze822.o mymemmem.o mytimegm.o
+maddr magrep mdeliver mdirs mexport mflag mgenmid mhdr minc mlist mpick mscan \
+  msed mseq mshow msort mthread : seq.o slurp.o mystrverscmp.o
 maddr magrep mflow mhdr mpick mscan mshow : rfc2047.o
 magrep mflow mhdr mshow : rfc2045.o
 mshow : filter.o safe_u8putstr.o rfc2231.o pipeto.o
diff --git a/man/mblaze-profile.5 b/man/mblaze-profile.5
index fe583095..d9aaad5c 100644
--- a/man/mblaze-profile.5
+++ b/man/mblaze-profile.5
@@ -49,6 +49,10 @@ The fully qualified domain name used for
 .Li Message\&-Id\&:
 generation in
 .Xr mgenmid 1 .
+.It Li Maildir\&:
+If set,
+.Xr mdirs 1
+will use this maildir when no directories are supplied.
 .It Li Outbox\&:
 If set,
 .Xr mcom 1
diff --git a/man/mdirs.1 b/man/mdirs.1
index 44ffae40..2dd2ea1e 100644
--- a/man/mdirs.1
+++ b/man/mdirs.1
@@ -1,4 +1,4 @@
-.Dd January 22, 2020
+.Dd July 25, 2023
 .Dt MDIRS 1
 .Os
 .Sh NAME
@@ -17,6 +17,14 @@ for maildir
 folders and prints them,
 separated by newlines.
 .Pp
+If
+.Ar dirs
+is not present then use 
+.Sq Li Maildir\&:
+from
+.Pa "${MBLAZE:-$HOME/.mblaze}/profile"
+.Pq if set .
+.Pp
 To
 .Nm ,
 a maildir folder is a directory containing
@@ -36,10 +44,20 @@ Print folders separated by a NUL character.
 .It Fl a
 Traverse into all subfolders, without considering the maildir++ name conventions.
 .El
+.Sh ENVIRONMENT
+.Bl -tag -width Ds
+.It Ev MBLAZE
+Directory containing mblaze configuration.
+.Po
+Default:
+.Pa $HOME/.mblaze
+.Pc
+.El
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
-.Xr find 1
+.Xr find 1 ,
+.Xr mblaze-profile 5
 .Sh AUTHORS
 .An Leah Neukirchen Aq Mt leah@vuxu.org
 .Sh LICENSE
diff --git a/mdirs.c b/mdirs.c
index 5f49906f..89ebab53 100644
--- a/mdirs.c
+++ b/mdirs.c
@@ -3,8 +3,10 @@
 
 #include <dirent.h>
 #include <limits.h>
+#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "blaze822.h"
@@ -72,6 +74,33 @@ mdirs(char *fpath)
 	closedir(dir);
 }
 
+char *
+profile_maildir()
+{
+	char *f = blaze822_home_file("profile");
+	struct message *config = blaze822(f);
+	char *maildir;
+	static char path[PATH_MAX];
+
+	if (!config)
+		return 0;
+
+	if (!(maildir = blaze822_hdr(config, "maildir")))
+		return 0;
+
+	if (strncmp(maildir, "~/", 2) == 0) {
+		const char *home = getenv("HOME");
+		if (!home) {
+			struct passwd *pw = getpwuid(getuid());
+			home = pw ? pw->pw_dir : "/dev/null/homeless";
+		}
+		snprintf(path, sizeof path, "%s/%s", home, maildir+2);
+		maildir = path;
+	}
+
+	return maildir;
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -86,11 +115,17 @@ main(int argc, char *argv[])
 			exit(1);
 		}
 
-	if (argc == optind)
-		goto usage;
-
 	xpledge("stdio rpath", "");
 
+	if (argc == optind) {
+		char *maildir = profile_maildir();
+		if (maildir) {
+			mdirs(maildir);
+			return 0;
+		}
+		goto usage;
+	}
+
 	char toplevel[PATH_MAX];
 	if (!getcwd(toplevel, sizeof toplevel)) {
 		perror("mdirs: getcwd");

Re: mdirs: add Maildir profile key

[meudwy]

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by meudwy on mblaze repository

https://github.com/leahneukirchen/mblaze/pull/245#issuecomment-1650001164

Comment:
Sorry. I have been browsing the code today so should have noticed. Fixed.

Re: [PR PATCH] [Closed]: mdirs: add Maildir profile key

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 272 bytes --]

There's a closed pull request on the mblaze repository

mdirs: add Maildir profile key
https://github.com/leahneukirchen/mblaze/pull/245

Description:
When `mdirs` is executed without any arguments, look for the `Maildir` key in the profile and use that instead (if set).