X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=ae1d5976b71f426329e09964b9c412ba854ab606;hp=e2347524506192b892bfd578faa2e5ed55d575b1;hb=c12823648ee84b4748e0e9f0cd97f7264911b589;hpb=46ba33b1159fb48b8360ddae72492cc3162dc999

diff --git a/notmuch.c b/notmuch.c
index e2347524..ae1d5976 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -41,8 +41,6 @@
 
 #include <talloc.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
@@ -236,7 +234,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 	    continue;
 	}
 
-	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",
@@ -289,7 +287,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 		ret = status;
 	}
 
-	free (next);
+	talloc_free (next);
 	next = NULL;
     }
 
@@ -299,7 +297,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 
   DONE:
     if (next)
-	free (next);
+	talloc_free (next);
     if (entry)
 	free (entry);
     if (dir)
@@ -342,7 +340,7 @@ static void
 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;
@@ -353,7 +351,7 @@ count_files (const char *path, int *count)
     if (dir == NULL) {
 	fprintf (stderr, "Warning: failed to open directory %s: %s\n",
 		 path, strerror (errno));
-	return;
+	goto DONE;
     }
 
     entry_length = offsetof (struct dirent, d_name) +
@@ -366,7 +364,7 @@ count_files (const char *path, int *count)
 	    fprintf (stderr, "Error reading directory: %s\n",
 		     strerror (errno));
 	    free (entry);
-	    return;
+	    goto DONE;
 	}
 
 	if (e == NULL)
@@ -384,7 +382,12 @@ count_files (const char *path, int *count)
 	    continue;
 	}
 
-	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;
+	}
 
 	stat (next, &st);
 
@@ -401,7 +404,9 @@ count_files (const char *path, int *count)
 	free (next);
     }
 
-    free (entry);
+  DONE:
+    if (entry)
+	free (entry);
 
     closedir (dir);
 }
@@ -610,6 +615,7 @@ search_command (int argc, char *argv[])
     notmuch_query_t *query;
     notmuch_thread_results_t *results;
     notmuch_thread_t *thread;
+    notmuch_tags_t *tags;
     char *query_str;
     int i;
     notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
@@ -641,9 +647,25 @@ search_command (int argc, char *argv[])
 	 notmuch_thread_results_has_more (results);
 	 notmuch_thread_results_advance (results))
     {
+	int first = 1;
+
 	thread = notmuch_thread_results_get (results);
 
-	printf ("%s\n", notmuch_thread_get_thread_id (thread));
+	printf ("%s %s",
+		notmuch_thread_get_thread_id (thread),
+		_notmuch_thread_get_subject (thread));
+
+	printf (" (");
+	for (tags = notmuch_thread_get_tags (thread);
+	     notmuch_tags_has_more (tags);
+	     notmuch_tags_advance (tags))
+	{
+	    if (! first)
+		printf (" ");
+	    printf ("%s", notmuch_tags_get (tags));
+	    first = 0;
+	}
+	printf (")\n");
 
 	notmuch_thread_destroy (thread);
     }
@@ -924,11 +946,11 @@ main (int argc, char *argv[])
 	strcmp (argv[1], "--help") == 0)
     {
 	fprintf (stderr, "The notmuch mail system.\n\n");
+	usage ();
+	return 0;
     } else {
 	fprintf (stderr, "Error: Unknown command '%s'\n\n", argv[1]);
+	usage ();
+	return 1;
     }
-    usage ();
-    exit (1);
-
-    return 0;
 }