X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=adu.h;h=8e629692a5c60652994f61f8e33c57bbb15b886a;hp=67607fdb7946151ed2085dc4ccb0fe324dee9128;hb=e6b9f49fcde364aeff6c0d38e66694eeac0573b4;hpb=1e723f61001e9f4448a465886b0b4ebcdadb388e

diff --git a/adu.h b/adu.h
index 67607fd..8e62969 100644
--- 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,15 +16,12 @@
 #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>
 #include "gcc-compat.h"
+#include "select.cmdline.h"
 
 /** debug loglevel, gets really noisy */
 #define DEBUG 1
@@ -118,6 +115,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,9 +174,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 struct gengetopt_args_info conf;
+extern struct select_args_info select_conf;
 
 /* adu.c */
 __printf_2_3 void __log(int, const char*, ...);
@@ -185,13 +188,18 @@ 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 parse_select_options(char *string, struct select_cmdline_parser_params *params,
+		struct uid_range **admissible_uids);
+int run_select_query(struct uid_range *admissible_uids);
 int com_select(void);
 
 /* create.h */
 int com_create(void);
+int com_interactive(void);