From: David Bremner <brem...@debian.org>
This roughly mimics the samba4 argument. The presence of the command
line argument overrides any value of NOTMUCH_TALLOC_REPORT in the
environment.
---
man/man1/notmuch.1 | 8 ++++++++
notmuch.c | 18 +++++++-----------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1
index 6bf9b2e..5c58c41 100644
--- a/man/man1/notmuch.1
+++ b/man/man1/notmuch.1
@@ -70,6 +70,14 @@ Print a synopsis of available commands and exit.
Print the installed version of notmuch, and exit.
.RE
+.RS 4
+.TP 4
+.BI \-\-leak-report= path
+
+Write a detailed report of all memory allocated via talloc to
+.I path
+.RE
+
.SH COMMANDS
diff --git a/notmuch.c b/notmuch.c
index a674481..f8d4b35 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -250,11 +250,13 @@ main (int argc, char *argv[])
command_t *command;
unsigned int i;
notmuch_bool_t print_help=FALSE, print_version=FALSE;
+ const char* leak_report=NULL;
int opt_index;
notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_BOOLEAN, &print_help, "help", 'h', 0 },
{ NOTMUCH_OPT_BOOLEAN, &print_version, "version", 'v', 0 },
+ { NOTMUCH_OPT_STRING, &leak_report, "leak-report", 'l', 0 },
{ 0, 0, 0, 0, 0 }
};
@@ -290,21 +292,15 @@ main (int argc, char *argv[])
if (strcmp (argv[opt_index], command->name) == 0) {
int ret;
- char *talloc_report;
ret = (command->function)(local, argc - opt_index, argv +
opt_index);
- /* in the future support for this environment variable may
- * be supplemented or replaced by command line arguments
- * --leak-report and/or --leak-report-full */
-
- talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");
-
- /* this relies on the previous call to
- * talloc_enable_null_tracking */
+ if (leak_report == NULL) {
+ leak_report = getenv ("NOTMUCH_TALLOC_REPORT");
+ }
- if (talloc_report && strcmp (talloc_report, "") != 0) {
- FILE *report = fopen (talloc_report, "w");
+ if (leak_report && (strcmp (leak_report, "") != 0)) {
+ FILE *report = fopen (leak_report, "w");
talloc_report_full (NULL, report);
}
--
1.7.10.4
_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
