chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
name_list: rename loop_name -> name_loop
[elogind.git]
/
udevtest.c
diff --git
a/udevtest.c
b/udevtest.c
index 91749a4eef38077b1ff70abddcf3ee0959b160e4..7b3ea6311d4c2a2178464affa0f54cd53b70cc8b 100644
(file)
--- a/
udevtest.c
+++ b/
udevtest.c
@@
-44,8
+44,7
@@
void log_message (int priority, const char *format, ...)
va_start(args, format);
vprintf(format, args);
va_end(args);
va_start(args, format);
vprintf(format, args);
va_end(args);
- if (format[strlen(format)-1] != '\n')
- printf("\n");
+ printf("\n");
}
#endif
}
#endif
@@
-91,16
+90,18
@@
out:
int main(int argc, char *argv[], char *envp[])
{
int force = 0;
int main(int argc, char *argv[], char *envp[])
{
int force = 0;
- char *action = "add";
-
struct udev_rules rules = {}
;
- char *devpath = NULL;
+ c
onst c
har *action = "add";
+
const char *subsystem = NULL
;
+ c
onst c
har *devpath = NULL;
struct udevice *udev;
struct sysfs_device *dev;
struct udevice *udev;
struct sysfs_device *dev;
+ struct udev_rules rules = {};
int retval;
int rc = 0;
static const struct option options[] = {
{ "action", 1, NULL, 'a' },
int retval;
int rc = 0;
static const struct option options[] = {
{ "action", 1, NULL, 'a' },
+ { "subsystem", 1, NULL, 's' },
{ "force", 0, NULL, 'f' },
{ "help", 0, NULL, 'h' },
{}
{ "force", 0, NULL, 'f' },
{ "help", 0, NULL, 'h' },
{}
@@
-119,7
+120,7
@@
int main(int argc, char *argv[], char *envp[])
while (1) {
int option;
while (1) {
int option;
- option = getopt_long(argc, argv, "a:fh", options, NULL);
+ option = getopt_long(argc, argv, "a:
s:
fh", options, NULL);
if (option == -1)
break;
if (option == -1)
break;
@@
-128,14
+129,18
@@
int main(int argc, char *argv[], char *envp[])
case 'a':
action = optarg;
break;
case 'a':
action = optarg;
break;
+ case 's':
+ subsystem = optarg;
+ break;
case 'f':
force = 1;
break;
case 'h':
case 'f':
force = 1;
break;
case 'h':
- printf("Usage: udevtest [--action=<string>] [--force] [--help] <devpath>\n"
- " --action=<string> set action string\n"
- " --force don't skip node/link creation\n"
- " --help print this help text\n\n");
+ printf("Usage: udevtest OPTIONS <devpath>\n"
+ " --action=<string> set action string\n"
+ " --subsystem=<string> set subsystem string\n"
+ " --force don't skip node/link creation\n"
+ " --help print this help text\n\n");
exit(0);
default:
exit(1);
exit(0);
default:
exit(1);
@@
-175,9
+180,12
@@
int main(int argc, char *argv[], char *envp[])
goto exit;
}
goto exit;
}
+ if (subsystem != NULL)
+ strlcpy(dev->subsystem, subsystem, sizeof(dev->subsystem));
+
/* override built-in sysfs device */
udev->dev = dev;
/* override built-in sysfs device */
udev->dev = dev;
- str
cpy(udev->action, action
);
+ str
lcpy(udev->action, action, sizeof(udev->action)
);
udev->devt = udev_device_get_devt(udev);
/* simulate node creation with test flag */
udev->devt = udev_device_get_devt(udev);
/* simulate node creation with test flag */
@@
-202,6
+210,7
@@
int main(int argc, char *argv[], char *envp[])
info("run: '%s'", program);
}
}
info("run: '%s'", program);
}
}
+ udev_device_cleanup(udev);
exit:
udev_rules_cleanup(&rules);
exit:
udev_rules_cleanup(&rules);