chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev_device_init() remove statically allocated device support
[elogind.git]
/
udev
/
test-udev.c
diff --git
a/udev/test-udev.c
b/udev/test-udev.c
index 4ac2d5a8891cedb53386de53358e42bd611c804f..4d5881deae99c4f47f02e2a0dc2a48225ebd947d 100644
(file)
--- a/
udev/test-udev.c
+++ b/
udev/test-udev.c
@@
-17,6
+17,8
@@
*
*/
*
*/
+#include "config.h"
+
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
@@
-27,6
+29,7
@@
#include <signal.h>
#include <unistd.h>
#include <syslog.h>
#include <signal.h>
#include <unistd.h>
#include <syslog.h>
+#include <grp.h>
#include "udev.h"
#include "udev_rules.h"
#include "udev.h"
#include "udev_rules.h"
@@
-71,7
+74,7
@@
int main(int argc, char *argv[], char *envp[])
int retval = -EINVAL;
if (argc == 2 && strcmp(argv[1], "-V") == 0) {
int retval = -EINVAL;
if (argc == 2 && strcmp(argv[1], "-V") == 0) {
- printf("%s\n",
UDEV_
VERSION);
+ printf("%s\n", VERSION);
exit(0);
}
exit(0);
}
@@
-93,7
+96,7
@@
int main(int argc, char *argv[], char *envp[])
err("open /dev/null failed: %s\n", strerror(errno));
udev_config_init();
selinux_init();
err("open /dev/null failed: %s\n", strerror(errno));
udev_config_init();
selinux_init();
- dbg("version %s\n",
UDEV_
VERSION);
+ dbg("version %s\n", VERSION);
/* set signal handlers */
memset(&act, 0x00, sizeof(act));
/* set signal handlers */
memset(&act, 0x00, sizeof(act));
@@
-136,7
+139,7
@@
int main(int argc, char *argv[], char *envp[])
goto fail;
}
goto fail;
}
- udev = udev_device_init(
NULL
);
+ udev = udev_device_init();
if (udev == NULL)
goto fail;
if (udev == NULL)
goto fail;
@@
-169,6
+172,7
@@
fail:
exit:
logging_close();
exit:
logging_close();
+ endgrent();
if (retval != 0)
return 1;
return 0;
if (retval != 0)
return 1;
return 0;