chiark / gitweb /
volume_id: rename subdirectory
[elogind.git] / udev_utils.c
index 2524baf..a37c4df 100644 (file)
 #include <ctype.h>
 #include <dirent.h>
 #include <syslog.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
 #include <sys/utsname.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "logging.h"
-#include "udev_utils.h"
-#include "list.h"
 
-/* compare string with pattern (supports * ? [0-9] [!A-Z]) */
-int strcmp_pattern(const char *p, const char *s)
-{
-       if (s[0] == '\0') {
-               while (p[0] == '*')
-                       p++;
-               return (p[0] != '\0');
-       }
-       switch (p[0]) {
-       case '[':
-               {
-                       int not = 0;
-                       p++;
-                       if (p[0] == '!') {
-                               not = 1;
-                               p++;
-                       }
-                       while ((p[0] != '\0') && (p[0] != ']')) {
-                               int match = 0;
-                               if (p[1] == '-') {
-                                       if ((s[0] >= p[0]) && (s[0] <= p[2]))
-                                               match = 1;
-                                       p += 3;
-                               } else {
-                                       match = (p[0] == s[0]);
-                                       p++;
-                               }
-                               if (match ^ not) {
-                                       while ((p[0] != '\0') && (p[0] != ']'))
-                                               p++;
-                                       if (p[0] == ']')
-                                               return strcmp_pattern(p+1, s+1);
-                               }
-                       }
-               }
-               break;
-       case '*':
-               if (strcmp_pattern(p, s+1))
-                       return strcmp_pattern(p+1, s);
-               return 0;
-       case '\0':
-               if (s[0] == '\0') {
-                       return 0;
-               }
-               break;
-       default:
-               if ((p[0] == s[0]) || (p[0] == '?'))
-                       return strcmp_pattern(p+1, s+1);
-               break;
-       }
-       return 1;
-}
-
-int string_is_true(const char *str)
-{
-       if (strcasecmp(str, "true") == 0)
-               return 1;
-       if (strcasecmp(str, "yes") == 0)
-               return 1;
-       if (strcasecmp(str, "1") == 0)
-               return 1;
-       return 0;
-}
 
 int log_priority(const char *priority)
 {
@@ -123,153 +53,6 @@ int log_priority(const char *priority)
        return 0;
 }
 
-int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel)
-{
-       static unsigned int kversion = 0;
-       static unsigned int kpatchlevel;
-       static unsigned int ksublevel;
-
-       if (kversion == 0) {
-               struct utsname uts;
-               if (uname(&uts) != 0)
-                       return -1;
-
-               if (sscanf (uts.release, "%u.%u.%u", &kversion, &kpatchlevel, &ksublevel) != 3) {
-                       kversion = 0;
-                       return -1;
-               }
-       }
-
-       if (kversion >= version && kpatchlevel >= patchlevel && ksublevel >= sublevel)
-               return 1;
-       else
-               return 0;
-}
-
-int create_path(const char *path)
-{
-       char p[PATH_SIZE];
-       char *pos;
-       struct stat stats;
-
-       strcpy (p, path);
-       pos = strrchr(p, '/');
-       if (pos == p || pos == NULL)
-               return 0;
-
-       while (pos[-1] == '/')
-               pos--;
-
-       pos[0] = '\0';
-
-       dbg("stat '%s'\n", p);
-       if (stat (p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
-               return 0;
-
-       if (create_path (p) != 0)
-               return -1;
-
-       dbg("mkdir '%s'\n", p);
-       return mkdir(p, 0755);
-}
-
-/* Reset permissions on the device node, before unlinking it to make sure,
- * that permisions of possible hard links will be removed too.
- */
-int unlink_secure(const char *filename)
-{
-       int retval;
-
-       retval = chown(filename, 0, 0);
-       if (retval)
-               dbg("chown(%s, 0, 0) failed with error '%s'", filename, strerror(errno));
-
-       retval = chmod(filename, 0000);
-       if (retval)
-               dbg("chmod(%s, 0000) failed with error '%s'", filename, strerror(errno));
-
-       retval = unlink(filename);
-       if (errno == ENOENT)
-               retval = 0;
-
-       if (retval)
-               dbg("unlink(%s) failed with error '%s'", filename, strerror(errno));
-
-       return retval;
-}
-
-int file_map(const char *filename, char **buf, size_t *bufsize)
-{
-       struct stat stats;
-       int fd;
-
-       fd = open(filename, O_RDONLY);
-       if (fd < 0) {
-               return -1;
-       }
-
-       if (fstat(fd, &stats) < 0) {
-               close(fd);
-               return -1;
-       }
-
-       *buf = mmap(NULL, stats.st_size, PROT_READ, MAP_SHARED, fd, 0);
-       if (*buf == MAP_FAILED) {
-               close(fd);
-               return -1;
-       }
-       *bufsize = stats.st_size;
-
-       close(fd);
-
-       return 0;
-}
-
-void file_unmap(void *buf, size_t bufsize)
-{
-       munmap(buf, bufsize);
-}
-
-/* return number of chars until the next newline, skip escaped newline */
-size_t buf_get_line(const char *buf, size_t buflen, size_t cur)
-{
-       int escape = 0;
-       size_t count;
-
-       for (count = cur; count < buflen; count++) {
-               if (!escape && buf[count] == '\n')
-                       break;
-
-               if (buf[count] == '\\')
-                       escape = 1;
-               else
-                       escape = 0;
-       }
-
-       return count - cur;
-}
-
-void replace_untrusted_chars(char *string)
-{
-       size_t len;
-
-       for (len = 0; string[len] != '\0'; len++) {
-               if (strchr(";,~\\()\'", string[len])) {
-                       info("replace '%c' in '%s'", string[len], string);
-                       string[len] = '_';
-               }
-       }
-}
-
-void remove_trailing_char(char *path, char c)
-{
-       size_t len;
-
-       len = strlen(path);
-       while (len > 0 && path[len-1] == c)
-               path[--len] = '\0';
-}
-
 int name_list_add(struct list_head *name_list, const char *name, int sort)
 {
        struct name_entry *loop_name;
@@ -330,6 +113,17 @@ int name_list_key_add(struct list_head *name_list, const char *key, const char *
        return 0;
 }
 
+void name_list_cleanup(struct list_head *name_list)
+{
+       struct name_entry *name_loop;
+       struct name_entry *temp_loop;
+
+       list_for_each_entry_safe(name_loop, temp_loop, name_list, node) {
+               list_del(&name_loop->node);
+               free(name_loop);
+       }
+}
+
 /* calls function for every file found in specified directory */
 int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix)
 {
@@ -341,7 +135,7 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
        dbg("open directory '%s'", dirname);
        dir = opendir(dirname);
        if (dir == NULL) {
-               dbg("unable to open '%s'", dirname);
+               err("unable to open '%s': %s", dirname, strerror(errno));
                return -1;
        }
 
@@ -371,110 +165,3 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
        closedir(dir);
        return 0;
 }
-
-int execute_program(const char *command, const char *subsystem,
-                   char *result, size_t ressize, size_t *reslen)
-{
-       int retval = 0;
-       int count;
-       int status;
-       int pipefds[2];
-       pid_t pid;
-       char *pos;
-       char arg[PATH_SIZE];
-       char *argv[(sizeof(arg) / 2) + 1];
-       int devnull;
-       int i;
-       size_t len;
-
-       strlcpy(arg, command, sizeof(arg));
-       i = 0;
-       if (strchr(arg, ' ')) {
-               pos = arg;
-               while (pos != NULL) {
-                       if (pos[0] == '\'') {
-                               /* don't separate if in apostrophes */
-                               pos++;
-                               argv[i] = strsep(&pos, "\'");
-                               while (pos && pos[0] == ' ')
-                                       pos++;
-                       } else {
-                               argv[i] = strsep(&pos, " ");
-                       }
-                       dbg("arg[%i] '%s'", i, argv[i]);
-                       i++;
-               }
-               argv[i] =  NULL;
-               dbg("execute '%s' with parsed arguments", arg);
-       } else {
-               argv[0] = arg;
-               argv[1] = (char *) subsystem;
-               argv[2] = NULL;
-               dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
-       }
-
-       if (result) {
-               if (pipe(pipefds) != 0) {
-                       err("pipe failed");
-                       return -1;
-               }
-       }
-
-       pid = fork();
-       switch(pid) {
-       case 0:
-               /* child dup2 write side of pipe to STDOUT */
-               devnull = open("/dev/null", O_RDWR);
-               if (devnull >= 0) {
-                       dup2(devnull, STDIN_FILENO);
-                       if (!result)
-                               dup2(devnull, STDOUT_FILENO);
-                       dup2(devnull, STDERR_FILENO);
-                       close(devnull);
-               }
-               if (result)
-                       dup2(pipefds[1], STDOUT_FILENO);
-               execv(arg, argv);
-               err("exec of program failed");
-               _exit(1);
-       case -1:
-               err("fork of '%s' failed", arg);
-               return -1;
-       default:
-               /* parent reads from pipefds[0] */
-               if (result) {
-                       close(pipefds[1]);
-                       len = 0;
-                       while (1) {
-                               count = read(pipefds[0], result + len, ressize - len-1);
-                               if (count < 0) {
-                                       err("read failed with '%s'", strerror(errno));
-                                       retval = -1;
-                                       break;
-                               }
-
-                               if (count == 0)
-                                       break;
-
-                               len += count;
-                               if (len >= ressize-1) {
-                                       err("ressize %ld too short", (long)ressize);
-                                       retval = -1;
-                                       break;
-                               }
-                       }
-                       result[len] = '\0';
-                       close(pipefds[0]);
-                       if (reslen)
-                               *reslen = len;
-               }
-               waitpid(pid, &status, 0);
-
-               if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
-                       dbg("exec program status 0x%x", status);
-                       retval = -1;
-               }
-       }
-
-       return retval;
-}