Merge commit 'fml/master'

[adu.git] / adu.h

diff --git a/adu.h b/adu.h
index a6a3892e6c33c5aaf52762d15debdb70b96790ac..2a15457b4b335bda8d28f219c8f100acfc6c5740 100644 (file)
--- a/adu.h
+++ b/adu.h
@@ -8,7 +8,7 @@
 
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <sys/wait.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h> /* time(), localtime() */
@@ -16,11 +16,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
-#include <ctype.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <sys/un.h> /* needed by create_pf_socket */
+#include <inttypes.h>
 #include <string.h>
 #include <assert.h>
 #include <osl.h>
@@ -118,6 +114,9 @@
        } \
 }
 
+/** Evaluates to 1 if x < y, to -1 if x > y and to 0 if x == y. */
+#define NUM_COMPARE(x, y) ((int)((x) < (y)) - (int)((x) > (y)))
+
 /** The columns of the directory table. */
 enum dir_table_columns {
        /** The name of the directory. */
@@ -174,12 +173,12 @@ enum search_uid_flags {
        CREATE_USER_TABLE = 2,
 };
 
+#define FOR_EACH_UID_RANGE(ur, urs) for (ur = urs; ur->low <= ur->high; ur++)
+
 extern uint32_t num_uids;
 extern struct osl_table *dir_table;
-extern uint64_t num_dirs;
-extern uint64_t num_files;
-extern uint64_t num_bytes;
 extern struct gengetopt_args_info conf;
+extern struct select_args_info select_conf;
 
 /* adu.c */
 __printf_2_3 void __log(int, const char*, ...);
@@ -188,13 +187,16 @@ void check_signals(void);
 void close_all_tables(void);
 char *get_uid_list_name(void);
 void create_hash_table(unsigned bits);
-int search_uid(uint32_t uid, enum search_uid_flags flags,
-               struct user_info **ui_ptr);
+int search_uid(uint32_t uid, struct uid_range *urs,
+               enum search_uid_flags flags, struct user_info **ui_ptr);
 int for_each_admissible_user(int (*func)(struct user_info *, void *),
                void *data);
+void sort_hash_table(int (*comp)(const void *, const void *));
 
 /* select.c */
+int run_select_query(struct uid_range *admissible_uids);
 int com_select(void);
 
 /* create.h */
 int com_create(void);
+int com_interactive(void);