/*
* Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2008 Kay Sievers <kay.sievers@vrfy.org>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 of the License.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
*
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
-
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
#include <grp.h>
#include "udev.h"
-#include "udev_rules.h"
-#include "udev_selinux.h"
-static void asmlinkage sig_handler(int signum)
+static void sig_handler(int signum)
{
switch (signum) {
case SIGALRM:
- exit(1);
+ _exit(1);
case SIGINT:
case SIGTERM:
- exit(20 + signum);
+ _exit(20 + signum);
}
}
int main(int argc, char *argv[])
{
struct udev *udev;
- struct sysfs_device *dev;
- struct udevice *udevice;
- const char *maj, *min;
- struct udev_rules rules;
- const char *action;
+ struct udev_event *event;
+ struct udev_device *dev;
+ struct udev_rules *rules;
+ char syspath[UTIL_PATH_SIZE];
const char *devpath;
+ const char *action;
const char *subsystem;
struct sigaction act;
- int devnull;
- int retval = -EINVAL;
+ sigset_t mask;
+ int err = -EINVAL;
udev = udev_new();
if (udev == NULL)
exit(1);
- dbg(udev, "version %s\n", VERSION);
- selinux_init(udev);
+ info(udev, "version %s\n", VERSION);
+ udev_selinux_init(udev);
/* set signal handlers */
memset(&act, 0x00, sizeof(act));
- act.sa_handler = (void (*)(int)) sig_handler;
+ act.sa_handler = sig_handler;
sigemptyset (&act.sa_mask);
act.sa_flags = 0;
sigaction(SIGALRM, &act, NULL);
sigaction(SIGINT, &act, NULL);
sigaction(SIGTERM, &act, NULL);
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGALRM);
+ sigaddset(&mask, SIGINT);
+ sigaddset(&mask, SIGTERM);
+ sigprocmask(SIG_UNBLOCK, &mask, NULL);
/* trigger timeout to prevent hanging processes */
alarm(UDEV_EVENT_TIMEOUT);
action = getenv("ACTION");
devpath = getenv("DEVPATH");
subsystem = getenv("SUBSYSTEM");
- /* older kernels passed the SUBSYSTEM only as argument */
- if (subsystem == NULL && argc == 2)
- subsystem = argv[1];
if (action == NULL || subsystem == NULL || devpath == NULL) {
err(udev, "action, subsystem or devpath missing\n");
goto exit;
}
- /* export log_priority , as called programs may want to do the same as udev */
- if (udev_get_log_priority(udev) > 0) {
- char priority[32];
-
- sprintf(priority, "%i", udev_get_log_priority(udev));
- setenv("UDEV_LOG", priority, 1);
- }
-
- sysfs_init();
- udev_rules_init(udev, &rules, 0);
+ rules = udev_rules_new(udev, 1);
- dev = sysfs_device_get(udev, devpath);
+ util_strscpyl(syspath, sizeof(syspath), udev_get_sys_path(udev), devpath, NULL);
+ dev = udev_device_new_from_syspath(udev, syspath);
if (dev == NULL) {
- info(udev, "unable to open '%s'\n", devpath);
+ info(udev, "unknown device '%s'\n", devpath);
goto fail;
}
- udevice = udev_device_init(udev);
- if (udevice == NULL)
- goto fail;
-
- /* override built-in sysfs device */
- udevice->dev = dev;
- strlcpy(udevice->action, action, sizeof(udevice->action));
-
- /* get dev_t from environment, which is needed for "remove" to work, "add" works also from sysfs */
- maj = getenv("MAJOR");
- min = getenv("MINOR");
- if (maj != NULL && min != NULL)
- udevice->devt = makedev(atoi(maj), atoi(min));
- else
- udevice->devt = udev_device_get_devt(udevice);
+ /* skip reading of db, but read kernel parameters */
+ udev_device_set_info_loaded(dev);
+ udev_device_read_uevent_file(dev);
- retval = udev_device_event(&rules, udevice);
+ udev_device_set_action(dev, action);
+ event = udev_event_new(dev);
+ err = udev_event_execute_rules(event, rules);
/* rules may change/disable the timeout */
- if (udevice->event_timeout >= 0)
- alarm(udevice->event_timeout);
+ if (udev_device_get_event_timeout(dev) >= 0)
+ alarm(udev_device_get_event_timeout(dev));
- if (retval == 0 && !udevice->ignore_device && udev_get_run(udev))
- udev_rules_run(udevice);
+ if (err == 0)
+ udev_event_execute_run(event, NULL);
- udev_device_cleanup(udevice);
+ udev_event_unref(event);
+ udev_device_unref(dev);
fail:
- udev_rules_cleanup(&rules);
- sysfs_cleanup();
- selinux_exit(udev);
+ udev_rules_unref(rules);
exit:
+ udev_selinux_exit(udev);
udev_unref(udev);
- if (retval != 0)
+ if (err != 0)
return 1;
return 0;
}
~ianmdlvl / elogind.git / blobdiff