X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-client.h;h=c04eaeb40a9c652cc82dd175c15741f9848e7ea7;hp=02ff8b742227f977a481574d282aa40839a7d84a;hb=5736ea3027a5ebf9824997fa05d05dd74284d66a;hpb=305e76bc0ab2e7f3bd1ff2580e8d5dac8b4a7164

diff --git a/notmuch-client.h b/notmuch-client.h
index 02ff8b74..c04eaeb4 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -66,20 +66,16 @@
 
 #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
 
-typedef int (*command_function_t) (void *ctx, int argc, char *argv[]);
-
-typedef struct command {
-    const char *name;
-    command_function_t function;
-    const char *summary;
-    const char *documentation;
-} command_t;
+#define STRNCMP_LITERAL(var, literal) \
+    strncmp ((var), (literal), sizeof (literal) - 1)
 
 typedef void (*add_files_callback_t) (notmuch_message_t *message);
 
 typedef struct {
     int ignore_read_only_directories;
     int saw_read_only_directory;
+    int output_is_a_tty;
+    int verbose;
 
     int total_files;
     int processed_files;
@@ -96,6 +92,9 @@ chomp_newline (char *str)
 	str[strlen(str)-1] = '\0';
 }
 
+int
+notmuch_count_command (void *ctx, int argc, char *argv[]);
+
 int
 notmuch_dump_command (void *ctx, int argc, char *argv[]);
 
@@ -121,7 +120,7 @@ int
 notmuch_tag_command (void *ctx, int argc, char *argv[]);
 
 const char *
-notmuch_time_relative_date (void *ctx, time_t then);
+notmuch_time_relative_date (const void *ctx, time_t then);
 
 void
 notmuch_time_print_formatted_seconds (double seconds);
@@ -145,7 +144,9 @@ show_message_body (const char *filename,
 typedef struct _notmuch_config notmuch_config_t;
 
 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);
 
 void
 notmuch_config_close (notmuch_config_t *config);
@@ -183,4 +184,7 @@ notmuch_config_set_user_other_email (notmuch_config_t *config,
 				     const char *other_email[],
 				     size_t length);
 
+notmuch_bool_t
+debugger_is_active (void);
+
 #endif