Replacing them with calls to talloc_asprintf if possible, otherwise
to asprintf (with it's painful error-handling leaving the pointer
undefined).
-#include <glib.h> /* g_strdup_printf, g_free, GPtrArray, GHashTable */
+#include <glib.h> /* g_free, GPtrArray, GHashTable */
Xapian::PostingIterator i;
char *term;
Xapian::PostingIterator i;
char *term;
- term = g_strdup_printf ("%s%s", _find_prefix (prefix_name), value);
+ term = talloc_asprintf (notmuch, "%s%s",
+ _find_prefix (prefix_name), value);
*begin = notmuch->xapian_db->postlist_begin (term);
*end = notmuch->xapian_db->postlist_end (term);
*begin = notmuch->xapian_db->postlist_begin (term);
*end = notmuch->xapian_db->postlist_end (term);
}
static notmuch_private_status_t
}
static notmuch_private_status_t
* If not NULL, then *next will be made to point to the first character
* not parsed, (possibly pointing to the final '\0' terminator.
*
* If not NULL, then *next will be made to point to the first character
* not parsed, (possibly pointing to the final '\0' terminator.
*
- * Returns a newly allocated string which the caller should free()
- * when done with it.
+ * Returns a newly talloc'ed string belonging to 'ctx'.
*
* Returns NULL if there is any error parsing the message-id. */
static char *
*
* Returns NULL if there is any error parsing the message-id. */
static char *
-parse_message_id (const char *message_id, const char **next)
+parse_message_id (void *ctx, const char *message_id, const char **next)
{
const char *s, *end;
char *result;
{
const char *s, *end;
char *result;
if (end <= s)
return NULL;
if (end <= s)
return NULL;
- result = strndup (s, end - s + 1);
+ result = talloc_strndup (ctx, s, end - s + 1);
/* Finally, collapse any whitespace that is within the message-id
* itself. */
/* Finally, collapse any whitespace that is within the message-id
* itself. */
-/* Parse a References header value, putting a copy of each referenced
- * message-id into 'hash'. */
+/* Parse a References header value, putting a (talloc'ed under 'ctx')
+ * copy of each referenced message-id into 'hash'. */
-parse_references (GHashTable *hash,
+parse_references (void *ctx,
+ GHashTable *hash,
const char *refs)
{
char *ref;
const char *refs)
{
char *ref;
- ref = parse_message_id (refs, &refs);
+ ref = parse_message_id (ctx, refs, &refs);
if (ref)
g_hash_table_insert (hash, ref, NULL);
if (ref)
g_hash_table_insert (hash, ref, NULL);
char *
notmuch_database_default_path (void)
{
char *
notmuch_database_default_path (void)
{
if (getenv ("NOTMUCH_BASE"))
return strdup (getenv ("NOTMUCH_BASE"));
if (getenv ("NOTMUCH_BASE"))
return strdup (getenv ("NOTMUCH_BASE"));
- return g_strdup_printf ("%s/mail", getenv ("HOME"));
+ if (asprintf (&path, "%s/mail", getenv ("HOME")) == -1) {
+ fprintf (stderr, "Out of memory.\n");
+ return xstrdup("");
+ }
+
+ return path;
- notmuch_path = g_strdup_printf ("%s/%s", path, ".notmuch");
+ notmuch_path = talloc_asprintf (NULL, "%s/%s", path, ".notmuch");
err = mkdir (notmuch_path, 0755);
err = mkdir (notmuch_path, 0755);
+ talloc_free (notmuch_path);
if (local_path)
free (local_path);
if (local_path)
free (local_path);
if (path == NULL)
path = local_path = notmuch_database_default_path ();
if (path == NULL)
path = local_path = notmuch_database_default_path ();
- notmuch_path = g_strdup_printf ("%s/%s", path, ".notmuch");
+ if (asprintf (¬much_path, "%s/%s", path, ".notmuch") == -1) {
+ notmuch_path = NULL;
+ fprintf (stderr, "Out of memory\n");
+ goto DONE;
+ }
err = stat (notmuch_path, &st);
if (err) {
err = stat (notmuch_path, &st);
if (err) {
- xapian_path = g_strdup_printf ("%s/%s", notmuch_path, "xapian");
+ if (asprintf (&xapian_path, "%s/%s", notmuch_path, "xapian") == -1) {
+ xapian_path = NULL;
+ fprintf (stderr, "Out of memory\n");
+ goto DONE;
+ }
notmuch = talloc (NULL, notmuch_database_t);
notmuch->path = talloc_strdup (notmuch, path);
notmuch = talloc (NULL, notmuch_database_t);
notmuch->path = talloc_strdup (notmuch, path);
+static void
+_my_talloc_free_for_g_hash (void *ptr)
+{
+ talloc_free (ptr);
+}
+
static notmuch_status_t
_notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
notmuch_message_t *message,
static notmuch_status_t
_notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
notmuch_message_t *message,
notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
parents = g_hash_table_new_full (g_str_hash, g_str_equal,
notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
parents = g_hash_table_new_full (g_str_hash, g_str_equal,
+ _my_talloc_free_for_g_hash, NULL);
refs = notmuch_message_file_get_header (message_file, "references");
refs = notmuch_message_file_get_header (message_file, "references");
- parse_references (parents, refs);
+ parse_references (message, parents, refs);
in_reply_to = notmuch_message_file_get_header (message_file, "in-reply-to");
in_reply_to = notmuch_message_file_get_header (message_file, "in-reply-to");
- parse_references (parents, in_reply_to);
+ parse_references (message, parents, in_reply_to);
keys = g_hash_table_get_keys (parents);
for (l = keys; l; l = l->next) {
keys = g_hash_table_get_keys (parents);
for (l = keys; l; l = l->next) {
header = notmuch_message_file_get_header (message_file, "message-id");
if (header) {
header = notmuch_message_file_get_header (message_file, "message-id");
if (header) {
- message_id = parse_message_id (header, NULL);
+ message_id = parse_message_id (message_file, header, NULL);
/* So the header value isn't RFC-compliant, but it's
* better than no message-id at all. */
if (message_id == NULL)
/* So the header value isn't RFC-compliant, but it's
* better than no message-id at all. */
if (message_id == NULL)
- message_id = xstrdup (header);
+ message_id = talloc_strdup (message_file, header);
} else {
/* No message-id at all, let's generate one by taking a
* hash over the file's contents. */
} else {
/* No message-id at all, let's generate one by taking a
* hash over the file's contents. */
- message_id = g_strdup_printf ("notmuch-sha1-%s", sha1);
+ message_id = talloc_asprintf (message_file,
+ "notmuch-sha1-%s", sha1);
notmuch,
message_id,
&ret);
notmuch,
message_id,
&ret);
+
+ talloc_free (message_id);
if (message == NULL)
goto DONE;
if (message == NULL)
goto DONE;
{
notmuch_message_file_t *message;
{
notmuch_message_file_t *message;
- message = xcalloc (1, sizeof (notmuch_message_file_t));
+ message = talloc_zero (NULL, notmuch_message_file_t);
message->file = fopen (filename, "r");
if (message->file == NULL)
message->file = fopen (filename, "r");
if (message->file == NULL)
if (message->file)
fclose (message->file);
if (message->file)
fclose (message->file);
#define NOTMUCH_PRIVATE_H
#ifndef _GNU_SOURCE
#define NOTMUCH_PRIVATE_H
#ifndef _GNU_SOURCE
-#define _GNU_SOURCE /* For getline */
+#define _GNU_SOURCE /* For getline and asprintf */
#endif
#include <stdio.h>
#endif
#include <stdio.h>
-#include <glib.h> /* g_strdup_printf */
-
#define unused(x) x __attribute__ ((unused))
/* There's no point in continuing when we've detected that we've done
#define unused(x) x __attribute__ ((unused))
/* There's no point in continuing when we've detected that we've done
- next = g_strdup_printf ("%s/%s", path, entry->d_name);
+ next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
if (stat (next, st)) {
fprintf (stderr, "Error reading %s: %s\n",
if (stat (next, st)) {
fprintf (stderr, "Error reading %s: %s\n",
if (entry)
free (entry);
if (dir)
if (entry)
free (entry);
if (dir)
count_files (const char *path, int *count)
{
DIR *dir;
count_files (const char *path, int *count)
{
DIR *dir;
- struct dirent *entry, *e;
+ struct dirent *e, *entry = NULL;
int entry_length;
int err;
char *next;
int entry_length;
int err;
char *next;
if (dir == NULL) {
fprintf (stderr, "Warning: failed to open directory %s: %s\n",
path, strerror (errno));
if (dir == NULL) {
fprintf (stderr, "Warning: failed to open directory %s: %s\n",
path, strerror (errno));
}
entry_length = offsetof (struct dirent, d_name) +
}
entry_length = offsetof (struct dirent, d_name) +
fprintf (stderr, "Error reading directory: %s\n",
strerror (errno));
free (entry);
fprintf (stderr, "Error reading directory: %s\n",
strerror (errno));
free (entry);
- next = g_strdup_printf ("%s/%s", path, entry->d_name);
+ if (asprintf (&next, "%s/%s", path, entry->d_name) == -1) {
+ next = NULL;
+ fprintf (stderr, "Error descending from %s to %s: Out of memory\n",
+ path, entry->d_name);
+ continue;
+ }
+ DONE:
+ if (entry)
+ free (entry);