notmuch-0.16: realpath() compatibility issue; clang visibility problem

[Thomas Klausner]

Hi!

I'm currently starting to try out notmuch-0.16 on NetBSD. It went off
to a rocky start, since it segfaulted in the initial config setup.

Debugging it I found that notmuch uses a glibc extension to realpath,
allowing NULL as second argument.

I've converted it to use a prepared buffer instead; attached is a
possible patch that makes notmuch complete its setup phase for me, and
adds inclusion of the header files suggested by the realpath man page
on NetBSD. Please address this issue in some way in the next release.

Additionally, when compiling with clang, there are issues with the
visibility. The symptoms are:

In file included from lib/database.cc:21:
In file included from ./lib/database-private.h:33:
./lib/notmuch-private.h:479:8: error: visibility does not match previous declaration
array subscriptstruct visible _notmuch_string_list {
       ^
./lib/notmuch-private.h:67:33: note: expanded from macro 'visible'
 # define visible __attribute__((visibility("default")))
                                ^
./lib/notmuch-private.h:52:13: note: previous attribute is here
#pragma GCC visibility push(hidden)
            ^

In file included from lib/parse-time-vrp.cc:23:
In file included from ./lib/database-private.h:33:
./lib/notmuch-private.h:479:8: error: visibility does not match previous declaration
struct visible _notmuch_string_list {
       ^
./lib/notmuch-private.h:67:33: note: expanded from macro 'visible'
# define visible __attribute__((visibility("default")))
                                ^
./lib/notmuch-private.h:52:13: note: previous attribute is here
#pragma GCC visibility push(hidden)
            ^
1 warning generated.
In file included from lib/directory.cc:21:
./lib/notmuch-private.h:479:8: error: visibility does not match previous declaration
struct visible _notmuch_string_list {
       ^
./lib/notmuch-private.h:67:33: note: expanded from macro 'visible'
# define visible __attribute__((visibility("default")))
                                ^
./lib/notmuch-private.h:52:13: note: previous attribute is here
#pragma GCC visibility push(hidden)
            ^

and so on. I guess it is because the visibility differs between c and
c++. I've disabled visibility locally, see second attached patch, but
of course that's not a solution, just a workaround. Suggestions
welcome.

Thanks,
 Thomas
-------------- next part --------------
$NetBSD$

NULL as second argument for realpath() is only supported in glibc.
Use more portable code.

--- notmuch-config.c.orig	2013-08-03 11:29:40.000000000 +0000
+++ notmuch-config.c
@@ -23,6 +23,8 @@
 #include <pwd.h>
 #include <netdb.h>
 #include <assert.h>
+#include <sys/param.h>
+#include <stdlib.h>
 
 static const char toplevel_config_comment[] =
     " .notmuch-config - Configuration file for the notmuch mail system\n"
@@ -444,7 +446,7 @@ int
 notmuch_config_save (notmuch_config_t *config)
 {
     size_t length;
-    char *data, *filename;
+    char *data, filename[MAXPATHLEN];
     GError *error = NULL;
 
     data = g_key_file_to_data (config->key_file, &length, NULL);
@@ -454,15 +456,9 @@ notmuch_config_save (notmuch_config_t *c
     }
 
     /* Try not to overwrite symlinks. */
-    filename = realpath (config->filename, NULL);
-    if (! filename) {
+    if (! realpath (config->filename, filename)) {
 	if (errno == ENOENT) {
-	    filename = strdup (config->filename);
-	    if (! filename) {
-		fprintf (stderr, "Out of memory.\n");
-		g_free (data);
-		return 1;
-	    }
+	    strcpy(filename, config->filename);
 	} else {
 	    fprintf (stderr, "Error canonicalizing %s: %s\n", config->filename,
 		     strerror (errno));
@@ -480,12 +476,10 @@ notmuch_config_save (notmuch_config_t *c
 		     filename, error->message);
 	}
 	g_error_free (error);
-	free (filename);
 	g_free (data);
 	return 1;
     }
 
-    free (filename);
     g_free (data);
     return 0;
 }
-------------- next part --------------
$NetBSD$

Doesn't compile with clang.

--- lib/notmuch-private.h.orig	2013-08-03 11:29:40.000000000 +0000
+++ lib/notmuch-private.h
@@ -64,7 +64,7 @@ NOTMUCH_BEGIN_DECLS
 #define unused(x) x __attribute__ ((unused))
 
 #ifdef __cplusplus
-# define visible __attribute__((visibility("default")))
+# define visible
 #else
 # define visible
 #endif