On Mon, Jul 21 2014, Mark Oteiza <mvote...@udel.edu> wrote: > Try to read the config parameter user.name from $NAME before taking the > user name from /etc/passwd.
LGTM. $NAME is used for the same purpose in https://www.gnu.org/software/emacs/manual/html_node/emacs/General-Variables.html (and probably in many other places too) Tomi > --- > notmuch-config.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/notmuch-config.c b/notmuch-config.c > index 4886d36..8f1f48d 100644 > --- a/notmuch-config.c > +++ b/notmuch-config.c > @@ -219,7 +219,8 @@ get_username_from_passwd_file (void *ctx) > * > * database_path: $HOME/mail > * > - * user_name: From /etc/passwd > + * user_name: $NAME variable if set, otherwise > + * read from /etc/passwd > * > * user_primary_mail: $EMAIL variable if set, otherwise > * constructed from the username and > @@ -329,7 +330,9 @@ notmuch_config_open (void *ctx, > } > > if (notmuch_config_get_user_name (config) == NULL) { > - char *name = get_name_from_passwd_file (config); > + char *name = getenv ("NAME"); > + if (! name) > + name = get_name_from_passwd_file (config); > notmuch_config_set_user_name (config, name); > talloc_free (name); > } > -- > 2.0.2 _______________________________________________ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
