[PATCH] PATCH udev close on exec

[elogind.git] / udev_lib.c

diff --git a/udev_lib.c b/udev_lib.c
index db1096ebf7b7254847c98f521d44e462cd373961..4991ec3acb4447699b34e2a643c76429a5d04833 100644 (file)
--- a/udev_lib.c
+++ b/udev_lib.c
@@ -58,15 +58,15 @@ char *get_devpath(void)
        return devpath;
 }
 
        return devpath;
 }
 

-char *get_devnode(void)
+char *get_devname(void)

 {
 {

-       char *devnode;
+       char *devname;

 
 

-       devnode = getenv("DEVNODE");
-       if (devnode != NULL && strlen(devnode) > NAME_SIZE)
-               devnode[NAME_SIZE-1] = '\0';
+       devname = getenv("DEVNAME");
+       if (devname != NULL && strlen(devname) > NAME_SIZE)
+               devname[NAME_SIZE-1] = '\0';

 
 

-       return devnode;
+       return devname;

 }
 
 char *get_seqnum(void)
 }
 
 char *get_seqnum(void)


@@ -124,11 +124,13 @@ int file_map(const char *filename, char **buf, size_t *bufsize)
        }
 
        if (fstat(fd, &stats) < 0) {
        }
 
        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) {
                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;
                return -1;
        }
        *bufsize = stats.st_size;


@@ -152,6 +154,26 @@ size_t buf_get_line(char *buf, size_t buflen, size_t cur)
        return count - cur;
 }
 
        return count - cur;
 }
 

+void leading_slash(char *path)
+{
+       int len;
+
+       len = strlen(path);
+       if (len > 0 && path[len-1] != '/') {
+               path[len] = '/';
+               path[len+1] = '\0';
+       }
+}
+
+void no_leading_slash(char *path)
+{
+       int len;
+
+       len = strlen(path);
+       if (len > 0 && path[len-1] == '/')
+               path[len-1] = '\0';
+}
+

 struct files {
        struct list_head list;
        char name[NAME_SIZE];
 struct files {
        struct list_head list;
        char name[NAME_SIZE];


@@ -180,7 +202,7 @@ static int file_list_insert(char *filename, struct list_head *file_list)
        return 0;
 }
 
        return 0;
 }
 

-/* calls function for file or every file found in directory */
+/* calls function for every file found in specified directory */

 int call_foreach_file(int fnct(char *f) , char *dirname, char *suffix)
 {
        struct dirent *ent;
 int call_foreach_file(int fnct(char *f) , char *dirname, char *suffix)
 {
        struct dirent *ent;


@@ -233,3 +255,22 @@ int call_foreach_file(int fnct(char *f) , char *dirname, char *suffix)
        closedir(dir);
        return 0;
 }
        closedir(dir);
        return 0;
 }

+
+/* Set the FD_CLOEXEC  flag of desc if value is nonzero,
+   or clear the flag if value is 0.
+   Return 0 on success, or -1 on error with errno  set. */ 
+       
+int set_cloexec_flag (int desc, int value)
+{
+       int oldflags = fcntl (desc, F_GETFD, 0);
+       /* If reading the flags failed, return error indication now. */
+       if (oldflags < 0)
+               return oldflags;
+       /* Set just the flag we want to set. */
+       if (value != 0)
+               oldflags |= FD_CLOEXEC;
+       else
+               oldflags &= ~FD_CLOEXEC;
+       /* Store modified flag word in the descriptor. */
+       return fcntl (desc, F_SETFD, oldflags);
+}