diff options
| author | David Bremner <david@tethera.net> | 2021-02-14 09:23:44 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-03-27 09:26:14 -0300 |
| commit | e81dc2072f22996a07e82b9b9b2eac826410e5a7 (patch) | |
| tree | 1900a4bf8abba9de2d060a974dbb8f2fdd4aae39 /lib | |
| parent | 863b2431853385441f9fcbc22b9ff4e963091440 (diff) | |
lib/config: set defaults for user full name
This just copies code from from the CLI into the library. New test
infrastructure is needed because apparently we have never tested this
code path.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/config.cc | 48 |
1 files changed, 47 insertions, 1 deletions
diff --git a/lib/config.cc b/lib/config.cc index ab45ae7b..38416632 100644 --- a/lib/config.cc +++ b/lib/config.cc @@ -22,6 +22,8 @@ #include "notmuch-private.h" #include "database-private.h" +#include <pwd.h> + static const std::string CONFIG_PREFIX = "C"; struct _notmuch_config_list { @@ -452,6 +454,41 @@ notmuch_config_get_bool (notmuch_database_t *notmuch, notmuch_config_key_t key, } static const char * +_get_name_from_passwd_file (void *ctx) +{ + long pw_buf_size; + char *pw_buf; + struct passwd passwd, *ignored; + const char *name; + int e; + + pw_buf_size = sysconf (_SC_GETPW_R_SIZE_MAX); + if (pw_buf_size == -1) pw_buf_size = 64; + pw_buf = (char *) talloc_size (ctx, pw_buf_size); + + while ((e = getpwuid_r (getuid (), &passwd, pw_buf, + pw_buf_size, &ignored)) == ERANGE) { + pw_buf_size = pw_buf_size * 2; + pw_buf = (char *) talloc_zero_size (ctx, pw_buf_size); + } + + if (e == 0) { + char *comma = strchr (passwd.pw_gecos, ','); + if (comma) + name = talloc_strndup (ctx, passwd.pw_gecos, + comma - passwd.pw_gecos); + else + name = talloc_strdup (ctx, passwd.pw_gecos); + } else { + name = talloc_strdup (ctx, ""); + } + + talloc_free (pw_buf); + + return name; +} + +static const char * _notmuch_config_key_to_string (notmuch_config_key_t key) { switch (key) { @@ -486,6 +523,7 @@ static const char * _notmuch_config_default (notmuch_database_t *notmuch, notmuch_config_key_t key) { char *path; + const char *name; switch (key) { case NOTMUCH_CONFIG_DATABASE_PATH: @@ -505,10 +543,18 @@ _notmuch_config_default (notmuch_database_t *notmuch, notmuch_config_key_t key) return "inbox;unread"; case NOTMUCH_CONFIG_SYNC_MAILDIR_FLAGS: return "true"; + case NOTMUCH_CONFIG_USER_NAME: + name = getenv ("NAME"); + if (name) + name = talloc_strdup (notmuch, name); + else + name = _get_name_from_passwd_file (notmuch); + + return name; + break; case NOTMUCH_CONFIG_HOOK_DIR: case NOTMUCH_CONFIG_BACKUP_DIR: case NOTMUCH_CONFIG_NEW_IGNORE: - case NOTMUCH_CONFIG_USER_NAME: case NOTMUCH_CONFIG_PRIMARY_EMAIL: case NOTMUCH_CONFIG_OTHER_EMAIL: return NULL; |
