X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibudev%2Flibudev.c;h=bc73a5a08c42a1ce3747ea0251c746f0542927c3;hp=a0ec39d0278a51d3288475616980b6d999c9fde0;hb=b26618399ecc9a773dcb384dd1ad66309921e8e0;hpb=c8f8394a9309d4390daac70b736b34d0b6734f95

diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index a0ec39d02..bc73a5a08 100644
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -1,13 +1,21 @@
-/*
- * libudev - interface to udev device information
- *
- * Copyright (C) 2008-2010 Kay Sievers <kay.sievers@vrfy.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- */
+/***
+  This file is part of systemd.
+
+  Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,6 +29,7 @@
 
 #include "libudev.h"
 #include "libudev-private.h"
+#include "missing.h"
 
 /**
  * SECTION:libudev
@@ -116,10 +125,10 @@ _public_ struct udev *udev_new(void)
                 return NULL;
         udev->refcount = 1;
         udev->log_fn = log_stderr;
-        udev->log_priority = LOG_ERR;
+        udev->log_priority = LOG_INFO;
         udev_list_init(udev, &udev->properties_list, true);
 
-        f = fopen(SYSCONFDIR "/udev/udev.conf", "re");
+        f = fopen("/etc/udev/udev.conf", "re");
         if (f != NULL) {
                 char line[UTIL_LINE_SIZE];
                 int line_nr = 0;
@@ -143,7 +152,7 @@ _public_ struct udev *udev_new(void)
                         /* split key/value */
                         val = strchr(key, '=');
                         if (val == NULL) {
-                                udev_err(udev, "missing <key>=<value> in " SYSCONFDIR "/udev/udev.conf[%i]; skip line\n", line_nr);
+                                udev_err(udev, "missing <key>=<value> in /etc/udev/udev.conf[%i]; skip line\n", line_nr);
                                 continue;
                         }
                         val[0] = '\0';
@@ -175,14 +184,14 @@ _public_ struct udev *udev_new(void)
                         /* unquote */
                         if (val[0] == '"' || val[0] == '\'') {
                                 if (val[len-1] != val[0]) {
-                                        udev_err(udev, "inconsistent quoting in " SYSCONFDIR "/udev/udev.conf[%i]; skip line\n", line_nr);
+                                        udev_err(udev, "inconsistent quoting in /etc/udev/udev.conf[%i]; skip line\n", line_nr);
                                         continue;
                                 }
                                 val[len-1] = '\0';
                                 val++;
                         }
 
-                        if (strcmp(key, "udev_log") == 0) {
+                        if (streq(key, "udev_log")) {
                                 udev_set_log_priority(udev, util_log_priority(val));
                                 continue;
                         }
@@ -191,7 +200,7 @@ _public_ struct udev *udev_new(void)
         }
 
         /* environment overrides config */
-        env = getenv("UDEV_LOG");
+        env = secure_getenv("UDEV_LOG");
         if (env != NULL)
                 udev_set_log_priority(udev, util_log_priority(env));
 
@@ -221,16 +230,18 @@ _public_ struct udev *udev_ref(struct udev *udev)
  * Drop a reference of the udev library context. If the refcount
  * reaches zero, the resources of the context will be released.
  *
+ * Returns: the passed udev library context if it has still an active reference, or #NULL otherwise.
  **/
-_public_ void udev_unref(struct udev *udev)
+_public_ struct udev *udev_unref(struct udev *udev)
 {
         if (udev == NULL)
-                return;
+                return NULL;
         udev->refcount--;
         if (udev->refcount > 0)
-                return;
+                return udev;
         udev_list_cleanup(&udev->properties_list);
         free(udev);
+        return NULL;
 }
 
 /**
@@ -283,51 +294,6 @@ _public_ void udev_set_log_priority(struct udev *udev, int priority)
         udev_add_property(udev, "UDEV_LOG", num);
 }
 
-/**
- * udev_get_sys_path:
- * @udev: udev library context
- *
- * Returns always "/sys"; deprecated, will be removed in a future version.
- *
- * Returns: the sys mount point
- **/
-_public_ const char *udev_get_sys_path(struct udev *udev)
-{
-        if (udev == NULL)
-                return NULL;
-        return "/sys";
-}
-
-/**
- * udev_get_dev_path:
- * @udev: udev library context
- *
- * Returns always "/dev"; deprecated, will be removed in a future version.
- *
- * Returns: the device directory path
- **/
-_public_ const char *udev_get_dev_path(struct udev *udev)
-{
-        if (udev == NULL)
-                return NULL;
-        return "/dev";
-}
-
-/**
- * udev_get_run_path:
- * @udev: udev library context
- *
- * Returns always "/run/udev"; deprecated, will be removed in a future version.
- *
- * Returns: the runtime directory path
- **/
-_public_ const char *udev_get_run_path(struct udev *udev)
-{
-        if (udev == NULL)
-                return NULL;
-        return "/run/udev";
-}
-
 struct udev_list_entry *udev_add_property(struct udev *udev, const char *key, const char *value)
 {
         if (value == NULL) {