X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.h;h=ea39a028f561495f2fcb9dcb0291e2d48cdc8341;hp=1ab4752cd3ca14ed66aeacd8acd72ab051ed0d7c;hb=2d8af104e0262554be2bf2cbbaa752bee6f1a65a;hpb=f0308095c78fd68c29be9b3b391bc1c077afa04c

diff --git a/udev_utils.h b/udev_utils.h
index 1ab4752cd..ea39a028f 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,78 +18,48 @@
  *
  */
 
-#ifndef _UDEV_LIB_H_
-#define _UDEV_LIB_H_
+#ifndef _UDEV_COMMON_H_
+#define _UDEV_COMMON_H_
 
 #include "udev.h"
+#include "list.h"
 
-#define strfieldcpy(to, from) \
-do { \
-	to[sizeof(to)-1] = '\0'; \
-	strncpy(to, from, sizeof(to)-1); \
-} while (0)
-
-#define strfieldcat(to, from) \
-do { \
-	to[sizeof(to)-1] = '\0'; \
-	strncat(to, from, sizeof(to) - strlen(to)-1); \
-} while (0)
-
-#define strfieldcpymax(to, from, maxsize) \
-do { \
-	to[maxsize-1] = '\0'; \
-	strncpy(to, from, maxsize-1); \
-} while (0)
-
-#define strfieldcatmax(to, from, maxsize) \
-do { \
-	to[maxsize-1] = '\0'; \
-	strncat(to, from, maxsize - strlen(to)-1); \
-} while (0)
-
-#define strintcat(to, i) \
-do { \
-	to[sizeof(to)-1] = '\0'; \
-	snprintf((to) + strlen(to), sizeof(to) - strlen(to)-1, "%u", i); \
-} while (0)
+#define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b))
 
-#define strintcatmax(to, i, maxsize) \
-do { \
-	to[maxsize-1] = '\0'; \
-	snprintf((to) + strlen(to), maxsize - strlen(to)-1, "%u", i); \
-} while (0)
-
-#define foreach_strpart(str, separator, pos, len) \
-	for(pos = str, len = 0; \
-	    (pos) < ((str) + strlen(str)); \
-	    pos = pos + len + strspn(pos, separator), len = strcspn(pos, separator)) \
-		if (len > 0)
-
-#ifdef asmlinkage
-# undef asmlinkage
-#endif
-#ifdef __i386__
-# define asmlinkage	__attribute__((regparm(0)))
-#endif
-#ifndef asmlinkage
-# define asmlinkage	/* nothing */
-#endif
+/* pipes */
+#define READ_END		0
+#define WRITE_END		1
 
 struct name_entry {
 	struct list_head node;
-	char name[NAME_SIZE];
+	char name[PATH_SIZE];
 };
 
-extern int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem);
+/* 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 void remove_trailing_chars(char *path, char c);
+extern int utf8_encoded_valid_unichar(const char *str);
+extern int replace_untrusted_chars(char *str);
+
+/* udev_utils_file.c */
 extern int create_path(const char *path);
-extern int parse_get_pair(char **orig_string, char **left, char **right);
-extern int unlink_secure(const char *filename);
 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 no_trailing_slash(char *path);
-extern int name_list_add(struct list_head *name_list, const char *name, int sort);
-extern int call_foreach_file(int (*handler_function)(struct udevice *udev, const char *string),
-			     struct udevice *udev, const char *dirname, const char *suffix);
+
+/* 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