shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-27 07:22:31 +03:00
Code

[PATCH] trivial cleanups and change some comments

Browse Source
This commit is contained in:
kay.sievers@vrfy.org 2004-11-29 02:15:55 +01:00 committed by Greg KH
parent 45a7b668ec
commit 2af003feb2
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
udev.c
View File

@ -111,17 +111,22 @@ int main(int argc, char *argv[], char *envp[])
act.sa_handler = (void (*) (int))sig_handler; act.sa_handler = (void (*) (int))sig_handler;
sigemptyset (&act.sa_mask); sigemptyset (&act.sa_mask);
act.sa_flags = 0; act.sa_flags = 0;
/* alarm must not restart syscalls*/
sigaction(SIGALRM, &act, NULL); sigaction(SIGALRM, &act, NULL);
sigaction(SIGINT, &act, NULL); sigaction(SIGINT, &act, NULL);
sigaction(SIGTERM, &act, NULL); sigaction(SIGTERM, &act, NULL);
/* trigger timeout to interrupt blocking syscalls */ /* trigger timeout to prevent hanging processes */
alarm(ALARM_TIMEOUT); alarm(ALARM_TIMEOUT);
action = getenv("ACTION");
devpath = getenv("DEVPATH");
subsystem = getenv("SUBSYSTEM");
/* older kernels passed the SUBSYSTEM only as argument */
if (!subsystem && argc == 2)
subsystem = argv[1];
udev_init_device(&udev, devpath, subsystem); udev_init_device(&udev, devpath, subsystem);
if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) { if (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) {
dbg("udevstart"); dbg("udevstart");
/* disable all logging, as it's much too slow on some facilities */ /* disable all logging, as it's much too slow on some facilities */

8
udev.h
View File

@ -50,14 +50,17 @@
struct udevice { struct udevice {
char devpath[DEVPATH_SIZE]; char devpath[DEVPATH_SIZE];
char subsystem[SUBSYSTEM_SIZE]; char subsystem[SUBSYSTEM_SIZE];
char name[NAME_SIZE]; char name[NAME_SIZE];
char symlink[NAME_SIZE];
char owner[OWNER_SIZE]; char owner[OWNER_SIZE];
char group[GROUP_SIZE]; char group[GROUP_SIZE];
mode_t mode;
char type; char type;
int major; int major;
int minor; int minor;
mode_t mode;
char symlink[NAME_SIZE]; char devname[NAME_SIZE];
int partitions; int partitions;
int ignore_remove; int ignore_remove;
int config_line; int config_line;
@ -67,7 +70,6 @@ struct udevice {
char program_result[NAME_SIZE]; char program_result[NAME_SIZE];
char kernel_number[NAME_SIZE]; char kernel_number[NAME_SIZE];
char kernel_name[NAME_SIZE]; char kernel_name[NAME_SIZE];
char devname[NAME_SIZE];
int test_run; int test_run;
}; };