X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=adu.h;h=012fddeea9a2bb5d146bd3de787aea3bf47543b6;hb=a398d5009251fa41859006dae5c99afc6824fab2;hp=f1d4fba029e6e79644e260d7db7566ae7c2b8ee2;hpb=9808428d6048fc0826e01d37017c89b4b4ffb9e6;p=adu.git

diff --git a/adu.h b/adu.h
index f1d4fba..012fdde 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
@@ -177,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*, ...);
@@ -188,14 +188,22 @@ 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 */
+struct select_format_info {
+	struct format_info *global_summary_fi;
+	struct format_info *user_summary_fi;
+};
+int parse_select_options(char *string, struct select_cmdline_parser_params *params,
+		struct uid_range **admissible_uids, struct select_format_info *sfi);
+int run_select_query(struct uid_range *admissible_uids, struct select_format_info *sfi);
 int com_select(void);
 
 /* create.h */
 int com_create(void);
+int com_interactive(void);