Merge remote branch 'dme/dme-for-cworth'

[notmuch] / notmuch-client.h

diff --git a/notmuch-client.h b/notmuch-client.h
index 4fe182ee7890ba6934f0297af53e269eee185650..a090589ef6ef28f350d1364f488b1b8f711bc0bf 100644 (file)
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -21,12 +21,13 @@
 #ifndef NOTMUCH_CLIENT_H
 #define NOTMUCH_CLIENT_H
 
-
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* for getline */
 #endif
 #include <stdio.h>
 
+#include "compat.h"
+
 #include <gmime/gmime.h>
 
 #include "notmuch.h"
@@ -50,6 +51,9 @@
 
 #define unused(x) x __attribute__ ((unused))
 
+#define STRINGIFY(s) STRINGIFY_(s)
+#define STRINGIFY_(s) #s
+
 /* There's no point in continuing when we've detected that we've done
  * something wrong internally (as opposed to the user passing in a
  * bogus value).
@@ -69,22 +73,6 @@
 #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;
-    int added_messages;
-    struct timeval tv_start;
-
-    add_files_callback_t callback;
-} add_files_state_t;
-
 static inline void
 chomp_newline (char *str)
 {
@@ -92,6 +80,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[]);
 
@@ -116,6 +107,12 @@ notmuch_show_command (void *ctx, int argc, char *argv[]);
 int
 notmuch_tag_command (void *ctx, int argc, char *argv[]);
 
+int
+notmuch_search_tags_command (void *ctx, int argc, char *argv[]);
+
+int
+notmuch_part_command (void *ctx, int argc, char *argv[]);
+
 const char *
 notmuch_time_relative_date (const void *ctx, time_t then);
 
@@ -125,10 +122,6 @@ notmuch_time_print_formatted_seconds (double seconds);
 double
 notmuch_time_elapsed (struct timeval start, struct timeval end);
 
-notmuch_status_t
-add_files (notmuch_database_t *notmuch, const char *path,
-          add_files_state_t *state);
-
 char *
 query_string_from_args (void *ctx, int argc, char *argv[]);
 
@@ -136,6 +129,12 @@ notmuch_status_t
 show_message_body (const char *filename,
                   void (*show_part) (GMimeObject *part, int *part_count));
 
+notmuch_status_t
+show_one_part (const char *filename, int part);
+
+char *
+json_quote_str (const void *ctx, const char *str);
+
 /* notmuch-config.c */
 
 typedef struct _notmuch_config notmuch_config_t;