X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-config.c;h=d697138af10150bc03c7cd4bd3a1d3fe73bfe87f;hp=dcdb0369c917cc562c28c5088c3443df0a616f6a;hb=221c7e0b38177f5f1dbf0561580c15e8aaa49004;hpb=65f2e61f28a0f5c5dc38dd3cf8a1de023934b330 diff --git a/notmuch-config.c b/notmuch-config.c index dcdb0369..d697138a 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -22,6 +22,7 @@ #include #include +#include static const char toplevel_config_comment[] = " .notmuch-config - Configuration file for the notmuch mail system\n" @@ -61,6 +62,28 @@ static const char user_config_comment[] = " recipient list of replies, and will set the From address based on the\n" " address to which the original email was addressed.\n"; +static const char maildir_config_comment[] = + " Maildir compatibility configuration\n" + "\n" + " The following option is supported here:\n" + "\n" + "\tsynchronize_flags Valid values are true and false.\n" + "\n" + "\tIf true, then the following maildir flags (in message filenames)\n" + "\twill be synchronized with the corresponding notmuch tags:\n" + "\n" + "\t\tFlag Tag\n" + "\t\t---- -------\n" + "\t\tD draft\n" + "\t\tF flagged\n" + "\t\tP passed\n" + "\t\tR replied\n" + "\t\tS unread (added when 'S' flag is not present)\n" + "\n" + "\tThe \"notmuch new\" command will notice flag changes in filenames\n" + "\tand update tags, while the \"notmuch tag\" and \"notmuch restore\"\n" + "\tcommands will notice tag changes and update flags in filenames\n"; + struct _notmuch_config { char *filename; GKeyFile *key_file; @@ -72,6 +95,7 @@ struct _notmuch_config { size_t user_other_email_length; const char **new_tags; size_t new_tags_length; + notmuch_bool_t maildir_synchronize_flags; }; static int @@ -86,13 +110,15 @@ notmuch_config_destructor (notmuch_config_t *config) static char * get_name_from_passwd_file (void *ctx) { - long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); - char *pw_buf = talloc_zero_size (ctx, pw_buf_size); + long pw_buf_size; + char *pw_buf; struct passwd passwd, *ignored; char *name; int e; + pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); if (pw_buf_size == -1) pw_buf_size = 64; + pw_buf = talloc_size (ctx, pw_buf_size); while ((e = getpwuid_r (getuid (), &passwd, pw_buf, pw_buf_size, &ignored)) == ERANGE) { @@ -119,13 +145,16 @@ get_name_from_passwd_file (void *ctx) static char * get_username_from_passwd_file (void *ctx) { - long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); - char *pw_buf = talloc_zero_size (ctx, pw_buf_size); + long pw_buf_size; + char *pw_buf; struct passwd passwd, *ignored; char *name; int e; + pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); if (pw_buf_size == -1) pw_buf_size = 64; + pw_buf = talloc_zero_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; @@ -191,6 +220,7 @@ notmuch_config_open (void *ctx, int file_had_database_group; int file_had_new_group; int file_had_user_group; + int file_had_maildir_group; if (is_new_ret) *is_new_ret = 0; @@ -221,6 +251,7 @@ notmuch_config_open (void *ctx, config->user_other_email_length = 0; config->new_tags = NULL; config->new_tags_length = 0; + config->maildir_synchronize_flags = TRUE; if (! g_key_file_load_from_file (config->key_file, config->filename, @@ -263,6 +294,7 @@ notmuch_config_open (void *ctx, "database"); file_had_new_group = g_key_file_has_group (config->key_file, "new"); file_had_user_group = g_key_file_has_group (config->key_file, "user"); + file_had_maildir_group = g_key_file_has_group (config->key_file, "maildir"); if (notmuch_config_get_database_path (config) == NULL) { @@ -313,6 +345,15 @@ notmuch_config_open (void *ctx, notmuch_config_set_new_tags (config, tags, 2); } + error = NULL; + config->maildir_synchronize_flags = + g_key_file_get_boolean (config->key_file, + "maildir", "synchronize_flags", &error); + if (error) { + notmuch_config_set_maildir_synchronize_flags (config, TRUE); + g_error_free (error); + } + /* Whenever we know of configuration sections that don't appear in * the configuration file, we add some comments to help the user * understand what can be done. */ @@ -340,6 +381,12 @@ notmuch_config_open (void *ctx, user_config_comment, NULL); } + if (! file_had_maildir_group) + { + g_key_file_set_comment (config->key_file, "maildir", NULL, + maildir_config_comment, NULL); + } + if (is_new_ret) *is_new_ret = is_new; @@ -474,92 +521,80 @@ notmuch_config_set_user_primary_email (notmuch_config_t *config, config->user_primary_email = NULL; } -const char ** -notmuch_config_get_user_other_email (notmuch_config_t *config, - size_t *length) +static const char ** +_config_get_list (notmuch_config_t *config, + const char *section, const char *key, + const char ***outlist, size_t *list_length, size_t *ret_length) { - char **emails; - size_t emails_length; - unsigned int i; - - if (config->user_other_email == NULL) { - emails = g_key_file_get_string_list (config->key_file, - "user", "other_email", - &emails_length, NULL); - if (emails) { - config->user_other_email = talloc_size (config, - sizeof (char *) * - (emails_length + 1)); - for (i = 0; i < emails_length; i++) - config->user_other_email[i] = talloc_strdup (config->user_other_email, - emails[i]); - config->user_other_email[i] = NULL; - - g_strfreev (emails); - - config->user_other_email_length = emails_length; + assert(outlist); + + if (*outlist == NULL) { + + char **inlist = g_key_file_get_string_list (config->key_file, + section, key, list_length, NULL); + if (inlist) { + unsigned int i; + + *outlist = talloc_size (config, sizeof (char *) * (*list_length + 1)); + + for (i = 0; i < *list_length; i++) + (*outlist)[i] = talloc_strdup (*outlist, inlist[i]); + + (*outlist)[i] = NULL; + + g_strfreev (inlist); } } - *length = config->user_other_email_length; - return config->user_other_email; + if (ret_length) + *ret_length = *list_length; + + return *outlist; } -void -notmuch_config_set_user_other_email (notmuch_config_t *config, - const char *other_email[], - size_t length) +const char ** +notmuch_config_get_user_other_email (notmuch_config_t *config, size_t *length) { - g_key_file_set_string_list (config->key_file, - "user", "other_email", - other_email, length); - - talloc_free (config->user_other_email); - config->user_other_email = NULL; + return _config_get_list (config, "user", "other_email", + &(config->user_other_email), + &(config->user_other_email_length), length); } const char ** -notmuch_config_get_new_tags (notmuch_config_t *config, - size_t *length) +notmuch_config_get_new_tags (notmuch_config_t *config, size_t *length) { - char **tags; - size_t tags_length; - unsigned int i; - - if (config->new_tags == NULL) { - tags = g_key_file_get_string_list (config->key_file, - "new", "tags", - &tags_length, NULL); - if (tags) { - config->new_tags = talloc_size (config, - sizeof (char *) * - (tags_length + 1)); - for (i = 0; i < tags_length; i++) - config->new_tags[i] = talloc_strdup (config->new_tags, - tags[i]); - config->new_tags[i] = NULL; - - g_strfreev (tags); - - config->new_tags_length = tags_length; - } - } + return _config_get_list (config, "new", "tags", + &(config->new_tags), + &(config->new_tags_length), length); +} - *length = config->new_tags_length; - return config->new_tags; +static void +_config_set_list (notmuch_config_t *config, + const char *group, const char *name, + const char *list[], + size_t length, const char ***config_var ) +{ + g_key_file_set_string_list (config->key_file, group, name, list, length); + talloc_free (*config_var); + *config_var = NULL; } void -notmuch_config_set_new_tags (notmuch_config_t *config, - const char *new_tags[], - size_t length) +notmuch_config_set_user_other_email (notmuch_config_t *config, + const char *list[], + size_t length) { - g_key_file_set_string_list (config->key_file, - "new", "tags", - new_tags, length); + _config_set_list (config, "user", "other_email", list, length, + &(config->user_other_email)); +} - talloc_free (config->new_tags); - config->new_tags = NULL; +void +notmuch_config_set_new_tags (notmuch_config_t *config, + const char *list[], + size_t length) +{ + _config_set_list (config, "new", "tags", list, length, + &(config->new_tags)); } /* Given a configuration item of the form . return the @@ -689,6 +724,8 @@ notmuch_config_command_set (void *ctx, char *item, int argc, char *argv[]) int notmuch_config_command (void *ctx, int argc, char *argv[]) { + argc--; argv++; /* skip subcommand argument */ + if (argc < 2) { fprintf (stderr, "Error: notmuch config requires at least two arguments.\n"); return 1; @@ -703,3 +740,18 @@ notmuch_config_command (void *ctx, int argc, char *argv[]) argv[0]); return 1; } + +notmuch_bool_t +notmuch_config_get_maildir_synchronize_flags (notmuch_config_t *config) +{ + return config->maildir_synchronize_flags; +} + +void +notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config, + notmuch_bool_t synchronize_flags) +{ + g_key_file_set_boolean (config->key_file, + "maildir", "synchronize_flags", synchronize_flags); + config->maildir_synchronize_flags = synchronize_flags; +}