[PATCH] remove untrusted chars read from sysfs-values or returned by PROGRAM

[elogind.git] / udev_utils.h

diff --git a/udev_utils.h b/udev_utils.h
index e36255f526f1e72b89d69eaf1c5dbcfd3e2ddc02..5ebc9e5bb6f830cdeb243cf9c35dccc9d513b0f3 100644 (file)
--- a/udev_utils.h
+++ b/udev_utils.h
@@ -24,67 +24,24 @@
 
 #include "udev.h"
 
-#define strfieldcpy(to, from) \
-do { \
-       to[sizeof(to)-1] = '\0'; \
-       strncpy(to, from, sizeof(to)-1); \
-} while (0)
+struct name_entry {
+       struct list_head node;
+       char name[PATH_SIZE];
+};
 
-#define strfieldcat(to, from) \
-do { \
-       to[sizeof(to)-1] = '\0'; \
-       strncat(to, from, sizeof(to) - strlen(to)-1); \
-} while (0)
+extern int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem);
+extern void udev_cleanup_device(struct udevice *udev);
 
-#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 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
-
-extern void udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem);
-extern int kernel_release_satisfactory(int version, int patchlevel, int sublevel);
+extern int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel);
 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 size_t buf_get_line(char *buf, size_t buflen, size_t cur);
-extern void no_trailing_slash(char *path);
-typedef int (*file_fnct_t)(const char *filename, void *data);
-extern int  call_foreach_file(file_fnct_t fnct, const char *dirname,
-                             const char *suffix, void *data);
+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);
 
 #endif