chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reject invalid quoted strings
[elogind.git]
/
src
/
core
/
device.c
diff --git
a/src/core/device.c
b/src/core/device.c
index 444286e02b2a7bfc14bd3a5b3c6bab6f10f1955b..2c41c7b6f44964b787ebdf4cfef72cbec6b4b353 100644
(file)
--- a/
src/core/device.c
+++ b/
src/core/device.c
@@
-220,7
+220,7
@@
static int device_make_description(Unit *u, struct udev_device *dev, const char
static int device_add_udev_wants(Unit *u, struct udev_device *dev) {
const char *wants;
static int device_add_udev_wants(Unit *u, struct udev_device *dev) {
const char *wants;
- c
har *state, *w
;
+ c
onst char *word, *state
;
size_t l;
int r;
size_t l;
int r;
@@
-234,11
+234,11
@@
static int device_add_udev_wants(Unit *u, struct udev_device *dev) {
if (!wants)
return 0;
if (!wants)
return 0;
- FOREACH_WORD_QUOTED(w, l, wants, state) {
+ FOREACH_WORD_QUOTED(w
ord
, l, wants, state) {
_cleanup_free_ char *n = NULL;
char e[l+1];
_cleanup_free_ char *n = NULL;
char e[l+1];
- memcpy(e, w, l);
+ memcpy(e, w
ord
, l);
e[l] = 0;
n = unit_name_mangle(e, MANGLE_NOGLOB);
e[l] = 0;
n = unit_name_mangle(e, MANGLE_NOGLOB);
@@
-393,13
+393,13
@@
static int device_process_new_device(Manager *m, struct udev_device *dev) {
* aliases */
alias = udev_device_get_property_value(dev, "SYSTEMD_ALIAS");
if (alias) {
* aliases */
alias = udev_device_get_property_value(dev, "SYSTEMD_ALIAS");
if (alias) {
- c
har *state, *w
;
+ c
onst char *word, *state
;
size_t l;
size_t l;
- FOREACH_WORD_QUOTED(w, l, alias, state) {
+ FOREACH_WORD_QUOTED(w
ord
, l, alias, state) {
char e[l+1];
char e[l+1];
- memcpy(e, w, l);
+ memcpy(e, w
ord
, l);
e[l] = 0;
if (path_is_absolute(e))
e[l] = 0;
if (path_is_absolute(e))