]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #17399 from afq984/udev-escaped-string
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 30 Oct 2020 00:52:45 +0000 (09:52 +0900)
committerGitHub <noreply@github.com>
Fri, 30 Oct 2020 00:52:45 +0000 (09:52 +0900)
Allow escaped string in udev rules

1  2 
src/shared/udev-util.c
src/shared/udev-util.h
src/test/meson.build

Simple merge
index 58803ea5226f4cd55b51537ccbc784169df4489e,427808c63bc2014d355141a030dfa263742d7508..0eb7f8190433a72d102617dbdfeeed363c5053c6
@@@ -28,7 -28,9 +28,9 @@@ static inline int udev_parse_config(voi
          return udev_parse_config_full(NULL, NULL, NULL, NULL, NULL);
  }
  
 -int device_wait_for_initialization(sd_device *device, const char *subsystem, usec_t timeout, sd_device **ret);
 -int device_wait_for_devlink(const char *path, const char *subsystem, usec_t timeout, sd_device **ret);
 +int device_wait_for_initialization(sd_device *device, const char *subsystem, usec_t deadline, sd_device **ret);
 +int device_wait_for_devlink(const char *path, const char *subsystem, usec_t deadline, sd_device **ret);
  int device_is_renaming(sd_device *dev);
  bool device_for_action(sd_device *dev, DeviceAction action);
+ int udev_rule_parse_value(char *str, char **ret_value, char **ret_endpos);
Simple merge