shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-26 17:25:34 +03:00
Code

bleah, more merge fixes...

Browse Source
This commit is contained in:
Greg KH 2005-04-26 23:15:56 -07:00 committed by Greg KH
parent 0d9057a1ce
commit 18ebc43050
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/udev-test.pl
View File

@ -35,6 +35,9 @@ my $perm = "udev.permissions";
my $main_conf = "udev-test.conf";
my $conf_tmp = "udev-test.rules";
# uncomment following line to run udev with valgrind.
# Should make this a runtime option to the script someday...
#my $udev_bin = "valgrind --tool=memcheck --leak-check=yes ../udev";
my @tests = (
{
@ -1260,7 +1263,6 @@ sub run_test {
udev("add", $config->{subsys}, $config->{devpath}, \$config->{conf});
if ((-e "$PWD/$udev_root$config->{exp_name}") ||
(-l "$PWD/$udev_root$config->{exp_name}")) {

1
udev.c
View File

@ -118,6 +118,7 @@ int main(int argc, char *argv[], char *envp[])
udev_init_config();
/* set signal handlers */
memset(&act, 0x00, sizeof(act));
act.sa_handler = (void (*) (int))sig_handler;
sigemptyset (&act.sa_mask);
act.sa_flags = 0;

2
udevinfo.c
View File

@ -401,7 +401,7 @@ print:
break;
case PATH:
strfieldcpy(result, path);
strfieldcpy(result, udev.devpath);
break;
case ALL: