IMPORT: do not mangle whitespace

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index dccc745eff54eb4169c6381e9c2cb519d3804746..05df871a3493ab900774110eff104dd2b0a64ed6 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -318,61 +318,43 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg)
 
 static int mem_size_mb(void)
 {
-       int f;
-       char buf[8192];
-       long int len;
-       const char *pos;
-       long int memsize;
-
-       f = open("/proc/meminfo", O_RDONLY);
-       if (f == -1)
-               return -1;
-
-       len = read(f, buf, sizeof(buf)-1);
-       close(f);
+       FILE* f;
+       char buf[4096];
+       long int memsize = -1;
 
-       if (len <= 0)
+       f = fopen("/proc/meminfo", "r");
+       if (f == NULL)
                return -1;
-       buf[len] = '\0';
 
-       pos = strstr(buf, "MemTotal: ");
-       if (pos == NULL)
-               return -1;
+       while (fgets(buf, sizeof(buf), f) != NULL) {
+               long int value;
 
-       if (sscanf(pos, "MemTotal: %ld kB", &memsize) != 1)
-               return -1;
+               if (sscanf(buf, "MemTotal: %ld kB", &value) == 1) {
+                       memsize = value / 1024;
+                       break;
+               }
+       }
 
-       return memsize / 1024;
+       fclose(f);
+       return memsize;
 }
 
 static int cpu_count(void)
 {
-       int f;
-       char buf[65536];
-       int len;
-       const char *pos;
+       FILE* f;
+       char buf[4096];
        int count = 0;
 
-       f = open("/proc/stat", O_RDONLY);
-       if (f == -1)
+       f = fopen("/proc/stat", "r");
+       if (f == NULL)
                return -1;
 
-       len = read(f, buf, sizeof(buf)-1);
-       close(f);
-       if (len <= 0)
-               return -1;
-       buf[len] = '\0';
-
-       pos = strstr(buf, "cpu");
-       if (pos == NULL)
-               return -1;
-
-       while (pos != NULL) {
-               if (strncmp(pos, "cpu", 3) == 0 &&isdigit(pos[3]))
+       while (fgets(buf, sizeof(buf), f) != NULL) {
+               if (strncmp(buf, "cpu", 3) == 0 && isdigit(buf[3]))
                        count++;
-               pos = strstr(&pos[3], "cpu");
        }
 
+       fclose(f);
        if (count == 0)
                return -1;
        return count;
@@ -380,29 +362,24 @@ static int cpu_count(void)
 
 static int running_processes(void)
 {
-       int f;
-       char buf[32768];
-       int len;
-       int running;
-       const char *pos;
+       FILE* f;
+       char buf[4096];
+       int running = -1;
 
-       f = open("/proc/stat", O_RDONLY);
-       if (f == -1)
+       f = fopen("/proc/stat", "r");
+       if (f == NULL)
                return -1;
 
-       len = read(f, buf, sizeof(buf)-1);
-       close(f);
-       if (len <= 0)
-               return -1;
-       buf[len] = '\0';
+       while (fgets(buf, sizeof(buf), f) != NULL) {
+               int value;
 
-       pos = strstr(buf, "procs_running ");
-       if (pos == NULL)
-               return -1;
-
-       if (sscanf(pos, "procs_running %u", &running) != 1)
-               return -1;
+               if (sscanf(buf, "procs_running %u", &value) == 1) {
+                       running = value;
+                       break;
+               }
+       }
 
+       fclose(f);
        return running;
 }
 
@@ -667,6 +644,7 @@ static void get_ctrl_msg(void)
        struct ucred *cred;
        char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
        int *intval;
+       char *pos;
 
        memset(&ctrl_msg, 0x00, sizeof(struct udevd_ctrl_msg));
        iov.iov_base = &ctrl_msg;
@@ -703,6 +681,21 @@ static void get_ctrl_msg(void)
        }
 
        switch (ctrl_msg.type) {
+       case UDEVD_CTRL_ENV:
+               pos = strchr(ctrl_msg.buf, '=');
+               if (pos == NULL) {
+                       err("wrong key format '%s'", ctrl_msg.buf);
+                       break;
+               }
+               pos[0] = '\0';
+               if (pos[1] == '\0') {
+                       info("udevd message (ENV) received, unset '%s'", ctrl_msg.buf);
+                       unsetenv(ctrl_msg.buf);
+               } else {
+                       info("udevd message (ENV) received, set '%s=%s'", ctrl_msg.buf, &pos[1]);
+                       setenv(ctrl_msg.buf, &pos[1], 1);
+               }
+               break;
        case UDEVD_CTRL_STOP_EXEC_QUEUE:
                info("udevd message (STOP_EXEC_QUEUE) received");
                stop_exec_q = 1;