X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.h;h=a07d8d2b7cecb6f152ef34f2631604b14dd4d68c;hp=b3e604fb98f99a6313d9bb35382934ede538a918;hb=5b13ecb830cdec338b514b9ed8c2c559c2f05223;hpb=6a522681e1438bbd9c317654cc35d5d206d378ad

diff --git a/udev_utils.h b/udev_utils.h
index b3e604fb9..a07d8d2b7 100644
--- a/udev_utils.h
+++ b/udev_utils.h
@@ -1,8 +1,7 @@
 /*
- * udev_lib - generic stuff used by udev
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * udev_utils.c - generic stuff used by udev
  *
+ * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -19,32 +18,44 @@
  *
  */
 
-#ifndef _UDEV_LIB_H_
-#define _UDEV_LIB_H_
+#ifndef _UDEV_COMMON_H_
+#define _UDEV_COMMON_H_
 
 #include "udev.h"
+#include "list.h"
+
+#define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b))
 
 struct name_entry {
 	struct list_head node;
 	char name[PATH_SIZE];
 };
 
-extern int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem, const char *action);
-extern void udev_cleanup_device(struct udevice *udev);
-
-extern int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel);
-extern int create_path(const char *path);
+/* udev_utils.c */
 extern int log_priority(const char *priority);
+extern int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel);
+extern int name_list_add(struct list_head *name_list, const char *name, int sort);
+extern int name_list_key_add(struct list_head *name_list, const char *key, const char *value);
+extern void name_list_cleanup(struct list_head *name_list);
+extern int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix);
+
+/* udev_utils_string.c */
+extern int strcmp_pattern(const char *p, const char *s);
 extern int string_is_true(const char *str);
-extern int parse_get_pair(char **orig_string, char **left, char **right);
-extern int unlink_secure(const char *filename);
+extern void replace_untrusted_chars(char *string);
+extern void remove_trailing_char(char *path, char c);
+extern int utf8_encoded_valid_unichar(const char *str);
+
+/* udev_utils_file.c */
+extern int create_path(const char *path);
 extern int file_map(const char *filename, char **buf, size_t *bufsize);
-extern void file_unmap(char *buf, size_t bufsize);
+extern void file_unmap(void *buf, size_t bufsize);
+extern int unlink_secure(const char *filename);
 extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur);
-extern void remove_trailing_char(char *path, char c);
-extern void replace_untrusted_chars(char *string);
-extern int name_list_add(struct list_head *name_list, const char *name, int sort);
-extern int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix);
-extern int execute_command(const char *command, const char *subsystem);
+
+/* udev_utils_run.c */
+extern int pass_env_to_socket(const char *name, const char *devpath, const char *action);
+extern int run_program(const char *command, const char *subsystem,
+		       char *result, size_t ressize, size_t *reslen, int log);
 
 #endif