Makefile: Split warnings into two sets (WARN_CFLAGS and WARN_CXXFLAGS)

[notmuch] / notmuch-config.c

diff --git a/notmuch-config.c b/notmuch-config.c
index f7313bfaa055d300114845e0375308ddf1ff9cfa..fc65d6b00cb1112ea59718798a3cdd2dc31be5d9 100644 (file)
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -80,8 +80,17 @@ get_name_from_passwd_file (void *ctx)
     char *pw_buf = talloc_zero_size (ctx, pw_buf_size);
     struct passwd passwd, *ignored;
     char *name;
+    int e;
 
-    if (getpwuid_r (getuid (), &passwd, pw_buf, pw_buf_size, &ignored) == 0) {
+    if (pw_buf_size == -1) pw_buf_size = 64;
+
+    while ((e = getpwuid_r (getuid (), &passwd, pw_buf,
+                            pw_buf_size, &ignored)) == ERANGE) {
+        pw_buf_size = pw_buf_size * 2;
+        pw_buf = 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,
@@ -104,8 +113,16 @@ get_username_from_passwd_file (void *ctx)
     char *pw_buf = talloc_zero_size (ctx, pw_buf_size);
     struct passwd passwd, *ignored;
     char *name;
+    int e;
+
+    if (pw_buf_size == -1) pw_buf_size = 64;
+    while ((e = getpwuid_r (getuid (), &passwd, pw_buf,
+                            pw_buf_size, &ignored)) == ERANGE) {
+        pw_buf_size = pw_buf_size * 2;
+        pw_buf = talloc_zero_size(ctx, pw_buf_size);
+    }
 
-    if (getpwuid_r (getuid (), &passwd, pw_buf, pw_buf_size, &ignored) == 0)
+    if (e == 0)
        name = talloc_strdup (ctx, passwd.pw_name);
     else
        name = talloc_strdup (ctx, "");
@@ -115,9 +132,10 @@ get_username_from_passwd_file (void *ctx)
     return name;
 }
 
-/* Open the named notmuch configuration file. A filename of NULL will
- * be interpreted as the default configuration file
- * ($HOME/.notmuch-config).
+/* Open the named notmuch configuration file. If the filename is NULL,
+ * the value of the environment variable $NOTMUCH_CONFIG will be used.
+ * If $NOTMUCH_CONFIG is unset, the default configuration file
+ * ($HOME/.notmuch-config) will be used.
  *
  * If any error occurs, (out of memory, or a permission-denied error,
  * etc.), this function will print a message to stderr and return
@@ -145,10 +163,16 @@ get_username_from_passwd_file (void *ctx)
  * in editing the file directly.
  */
 notmuch_config_t *
-notmuch_config_open (void *ctx, const char *filename)
+notmuch_config_open (void *ctx,
+                    const char *filename,
+                    notmuch_bool_t *is_new_ret)
 {
     GError *error = NULL;
-    int config_file_is_new = 0;
+    int is_new = 0;
+    char *notmuch_config_env = NULL;
+
+    if (is_new_ret)
+       *is_new_ret = 0;
 
     notmuch_config_t *config = talloc (ctx, notmuch_config_t);
     if (config == NULL) {
@@ -158,11 +182,15 @@ notmuch_config_open (void *ctx, const char *filename)
     
     talloc_set_destructor (config, notmuch_config_destructor);
 
-    if (filename)
+    if (filename) {
        config->filename = talloc_strdup (config, filename);
-    else
+    } else if ((notmuch_config_env = getenv ("NOTMUCH_CONFIG"))) {
+       config->filename = talloc_strdup (config, notmuch_config_env);
+       notmuch_config_env = NULL;
+    } else {
        config->filename = talloc_asprintf (config, "%s/.notmuch-config",
                                            getenv ("HOME"));
+    }
 
     config->key_file = g_key_file_new ();
 
@@ -185,10 +213,12 @@ notmuch_config_open (void *ctx, const char *filename)
            fprintf (stderr, "Error reading configuration file %s: %s\n",
                     config->filename, error->message);
            talloc_free (config);
+           g_error_free (error);
            return NULL;
        }
 
-       config_file_is_new = 1;
+       g_error_free (error);
+       is_new = 1;
     }
 
     if (notmuch_config_get_database_path (config) == NULL) {
@@ -236,7 +266,7 @@ notmuch_config_open (void *ctx, const char *filename)
 
     /* When we create a new configuration file here, we  add some
      * comments to help the user understand what can be done. */
-    if (config_file_is_new) {
+    if (is_new) {
        g_key_file_set_comment (config->key_file, NULL, NULL,
                                toplevel_config_comment, NULL);
        g_key_file_set_comment (config->key_file, "database", NULL,
@@ -245,6 +275,9 @@ notmuch_config_open (void *ctx, const char *filename)
                                user_config_comment, NULL);
     }
 
+    if (is_new_ret)
+       *is_new_ret = is_new;
+
     return config;
 }
 
@@ -283,6 +316,7 @@ notmuch_config_save (notmuch_config_t *config)
     if (! g_file_set_contents (config->filename, data, length, &error)) {
        fprintf (stderr, "Error saving configuration to %s: %s\n",
                 config->filename, error->message);
+       g_error_free (error);
        return 1;
     }