Commit Graph

9909 Commits

Author SHA1 Message Date
Dave Reisner
67ba217a19 udev-rules: report rule parsing errors from get_key 2013-07-30 13:50:13 -04:00
Anthony G. Basile
38382ffbd6 Bring collect.c and udevadm-hwdb.c in line with upstream
This brings these two files in line with upstream's commit:

  ef89eef77ee098a6828169a6d0d74128e236bcbd
  udev: fix two trivial memleaks in error path
  Based-on-a-patch-by: Ian Stakenvicius <axs@gentoo.org>

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-30 13:46:21 -04:00
Anthony G. Basile
f6571c3d64 rules: bring up to date with upstream
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-30 08:48:51 -04:00
Anthony G. Basile
9930444543 man/udev.xml: add doc about hwdb database
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-30 08:37:19 -04:00
Ian Stakenvicius
35876baf30 Switch from external keymaps to internal (hwdb) keymaps
This commit imports the new internal keyboard handling from upstream.
This is a combination of many upstream commits, including those
that added code, removed old code, and updated the hwdb.
Some commits (hwdb ones specifically) were unrelated but brought
in anyways to keep the whole hwdb consistent.  Each upstream
commit included is as follows:

9d7d42bc406a2ac04639674281ce3ff6beeda790 - internal keymap support
0c959b39175b126fdb70ae00de37ca6d9c8ca3a1 - hwdb: keyboard -- add file
e8193554925a22b63bef0e77b8397b56d63a91ff - hwdb: keyboard -- update comments
c79d894d590fc9df4861738555cc43c477e33376 - hwdb: import data
aedc2eddd16e48d468e6ad0aea2caf00c7d37365 - hwdb: keyboard update
97a9313cafccf772ce03f5ebd36fe4d9d8412583 - hwdb: drop non-existant Samsung 900XC3 from keymap
ddc77f62244bb41d5c8261517e2e1ff1b763fc94 - switch from udev keymaps to hwdb
0c3815773331b263713f4f7b9d80bc1ca159338e - also remove keymaps-force-release directory
1b6bce89b3383904d0dab619dd38bff673f7286e - keymap: re-add Logitech USB corded/cordless models
bf89b99c5a39115112c2eda4c2103e2db54988d2 - 60-keyboard.hwdb: Fix syntax error
ce39bb6909578017aa10031638e724e038f0b859 - hwdb: data update, upstream
884c86812c51479496edd50b278383d7bb67baf0 - rules: keyboard - use builtin command

All code from each of the above commits is attributed to the original
authors.

There were some adjustments made in order to support the code differences
between upstream and eudev, which was done by myself.

Also of note is that the code can still be disabled via the --disable-keymaps
configure option, which was removed from upstream.

Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
2013-07-24 16:27:01 -04:00
Anthony G. Basile
87b69cb045 src/udev/udevadm-hwdb.c: fix double free
clang is stupid and I will never blindly trust it again.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-11 09:37:36 -04:00
Anthony G. Basile
1fdae2bccb Version bump to 1.1
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-11 09:05:41 -04:00
Anthony G. Basile
da7301e983 src/udev/udev-builtin-kmod.c: fix char *const declaration
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-11 08:34:22 -04:00
Ian Stakenvicius
b2cf1c7154 Fix potential memleak and use-after-free errors as reported by clang
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-10 15:14:00 -04:00
Anthony G. Basile
5957c143c1 src/udev/udev-builtin-kmod.c: fix const char* declaration
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-10 13:51:28 -04:00
Anthony G. Basile
ae66dd92e5 src/udev/mkdir.c: import path_startswith() from upstream
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-10 12:59:18 -04:00
Anthony G. Basile
7a2e1b1409 src/udev/udev-ctrl.c: explicitly declare return value
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-10 12:37:46 -04:00
Anthony G. Basile
037a28c3d2 Bring mkdir.c, label.c and util.c in better line with upstream
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-10 12:31:27 -04:00
Kay Sievers
fbae392487 hwdb: allow list of lookup keys per given record
This allows to specify:
  dmi:bvn*:bvr*:bd*:svnVENDOR:pn:Model 231*:pvr*
  dmi:bvn*:bvr*:bd*:svnVENDOR:pn:Series 12*:pvr*
   KEY_A=value
   KEY_B=value

Instead of:
  dmi:bvn*:bvr*:bd*:svnVENDOR:pn:Model 231*:pvr*
   KEY_A=value
   KEY_B=value

  dmi:bvn*:bvr*:bd*:svnVENDOR:pn:Series 12*:pvr*
   KEY_A=value
   KEY_B=value

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-10 11:14:22 -04:00
Kay Sievers
6f85433a3b hwdb: return false if no property is found
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-10 11:13:55 -04:00
Ian Stakenvicius
77d68de482 rule-generator: make sure /etc/udev/rules.d/ exists prior to trying to write to it
Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
2013-07-10 10:52:13 -04:00
Anthony G. Basile
e1dda94b63 docs/{gudev,libudev}: disable tests so make check works
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-09 04:06:52 -04:00
Anthony G. Basile
22f5ebe441 UPSTREAM.notes: log imports from upstream
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-09 03:58:24 -04:00
Kay Sievers
0d950bc040 hwdb: add --lookup-prefix= option 2013-07-09 03:42:06 -04:00
Anthony G. Basile
5084c56432 src/gudev: update LGPL info
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-09 03:25:34 -04:00
Anthony G. Basile
e5e61f4666 hwdb: sync with upstream
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-09 03:16:31 -04:00
Kay Sievers
e92a5c88fc hwdb: remove too broad PNP* match from 20-acpi-vendor.hwdb 2013-07-09 03:13:09 -04:00
Kay Sievers
3b94a10e35 hwdb: update
This is upstream commit 07125a9240088f7859b18908cc7d07e396947e24

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-09 03:11:28 -04:00
Anthony G. Basile
5d2c61c397 src/libudev/libudev-private.h: add missing include strxcpyx.h
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-07 12:19:12 -04:00
Kay Sievers
7a3bcc197c hwdb: allow to query arbitrary keys
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-07 12:13:45 -04:00
Kay Sievers
36cac2c40f hwdb: add --device=<device-id> and --filter=<key name glob>
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-07 12:12:45 -04:00
Kay Sievers
86d0542d34 hwdb: remove support for (not fully implemented) conditional properties
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-07 12:04:06 -04:00
Anthony G. Basile
c9096d0490 Add sanity checks to paths in cgroup-util.c
This is part of upstream commit

	9444b1f20e311f073864d81e913bd4f32fe95cfd

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-07 11:44:52 -04:00
Zbigniew Jędrzejewski-Szmek
68db594ba6 dev-setup: do not create a dangling /proc/kcore symlink
https://bugs.freedesktop.org/show_bug.cgi?id=65382
https://bugs.gentoo.org/472060?id=472060
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-07 11:22:02 -04:00
Anthony G. Basile
faa1ff8ef8 Import strxcpyx from upstream
This commit imports strxcpyx from upstream.  This is upstream commit

    d5a89d7dc17a5ba5cf4fc71f82963c5c94a31c3d

Note: there were also some very minor code cleanups to

	accelerometer.c: line 187
	collect.c: lines 35, 140
	libudev-device.c: line 780
	libudev-hwdb.c: line 300

These are part of upstream commits:

	507f22bd0172bff5e5d98145b1419bd472a2c57f
	3cf7b686e6b29f78de0af5929602cae4482f6d49
	67410e9f73a6cdd8453c78b966451b5151def14a

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-07 11:16:55 -04:00
Anthony G. Basile
44e6f1bc1a test: improve test-udev.c
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-06 23:13:39 -04:00
Anthony G. Basile
8b06a435cc rules: updates from upstream
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-06 23:02:06 -04:00
Anthony G. Basile
1c88925eee keymaps, keymaps-force-release: updates from upstream
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-06 22:52:03 -04:00
Anthony G. Basile
c8cdca5d5c hwdb: update from upstream
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-06 22:46:29 -04:00
Ian Stakenvicius
3909dfd26c create /etc/udev/rules.d target on install
Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
2013-07-03 14:14:29 -04:00
andrew-aladev
42e8bb6f12 rule_generator/rule_generator.functions: fix net rule generator
`udevadm info --run` no longer returns the correct run directory
 so we hard code it as "/run/udev/"

X-Gentoo-Bug: 475276
X-Gentoo-Bug-URL: https://bugs.gentoo.org/475276
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-07-01 12:57:38 -04:00
Anthony G. Basile
b722b49e9e src/udev/udev-ctrl.c: restore accept4_fallback code
This code was accidentally removed in commit

    601c4e8ce6

We restore it here.  Since most modern systems have accept4()
this code will seldom be triggered.  You can test by configuring
as follows:

    ac_cv_have_decl_accept4="no" ./configure

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-29 13:36:01 -04:00
Sean McGovern
983cecd795 udev: handle network controllers in nonstandard domains
Onboard network controllers are not always on PCI domain 0.

[Kay: use int instead of long, add [P] to slot naming, remove sysname var]

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-26 14:15:52 -04:00
Martin Pitt
98cddf4cb7 keymap: Apply to all Latitude and Precision models
https://launchpad.net/bugs/1193147

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-26 14:07:36 -04:00
Jan Janssen
b61630e3cf libudev: Use correct type for sizeof
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-26 14:04:18 -04:00
Zbigniew Jędrzejewski-Szmek
ff93c898bc man: always supply quotes around literals
When manpages are displayed on a terminal, <literal>s are indistinguishable
from surrounding text. Add quotes everywhere, remove duplicate quotes,
and tweak a few lists for consistent formatting.

https://bugzilla.redhat.com/show_bug.cgi?id=874631

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-26 14:02:06 -04:00
Anthony G. Basile
5ec82b08d4 man/udev.xml: minor cleanup
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-26 13:57:29 -04:00
Anthony G. Basile
65a2b36600 src/libudev/log.c: remove uneeded #include <printf.h>
This header is unnecessary and causes a buildtime error on musl.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-15 16:04:11 -04:00
Anthony G. Basile
604b9042e3 Version bump to 1.0, dropping _beta tag
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-09 05:08:04 -04:00
Anthony G. Basile
1eaa837ba6 Round 2 of remove unused DECLS from src/libudev/{ioprio,log,macro,set,strv}
Remove the following unused DECLS:

  IOPRIO_BITS
  IOPRIO_CLASS_SHIFT
  IOPRIO_PRIO_MASK
  IOPRIO_PRIO_CLASS
  IOPRIO_PRIO_DATA
  IOPRIO_PRIO_VALUE
  ioprio_valid
  IOPRIO_BE_NR
  IOPRIO_WHO_PROCESS
  IOPRIO_WHO_PGRP
  IOPRIO_WHO_USER
  MESSAGE_ID
  EXIT_TEST_SKIP
  XSTRINGIFY
  STRINGIFY
  ALIGN_PTR
  ALIGN4_PTR
  ALIGN8_PTR
  MAX
  MAX3
  MIN
  CLAMP
  zero
  CHAR_TO_STR
  VA_FORMAT_ADVANCE
  SET_FLAG
  SET_FOREACH
  SET_FOREACH_BACKWARDS
  STRV_FOREACH_BACKWARDS
  STRV_FOREACH_PAIR
  _unused_
  _destructor_
  _deprecated_
  _weak_
  _hidden_
  _weakref_
  _introspect_
  _alignas_

Remove the following unused static inline functions:

  static inline int ioprio_set
  static inline int ioprio_get
  static inline const char* STRV_IFNOTNULL

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-06 21:03:42 -04:00
Anthony G. Basile
f90cec7e84 Fix ordering of params for conf_files_list_strv
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-06 18:35:30 -04:00
Anthony G. Basile
74b55d4d6d Remove unused DECLS from src/libudev/{conf-files,def,exit-status,hashmap,util}.h
The following unused DECLS are removed:

  DEFAULT_TIMEOUT_USEC
  DEFAULT_RESTART_USEC
  DEFAULT_CONFIRM_USEC
  DEFAULT_EXIT_USEC
  SIGNALS_CRASH_HANDLER
  SIGNALS_IGNORE
  EXIT_INVALIDARGUMENT
  EXIT_NOTIMPLEMENTED
  EXIT_NOPERMISSION
  EXIT_NOTINSTALLED
  EXIT_NOTCONFIGURED
  EXIT_NOTRUNNING
  EXIT_CHDIR
  EXIT_NICE
  EXIT_FDS
  EXIT_EXEC
  EXIT_MEMORY
  EXIT_LIMITS
  EXIT_OOM_ADJUST
  EXIT_SIGNAL_MASK
  EXIT_STDIN
  EXIT_STDOUT
  EXIT_CHROOT
  EXIT_IOPRI
  EXIT_TIMERSLACK
  EXIT_SECUREBITS
  EXIT_SETSCHEDULER
  EXIT_CPUAFFINITY
  EXIT_GROUP
  EXIT_USER
  EXIT_CAPABILITIES
  EXIT_CGROUP
  EXIT_SETSID
  EXIT_CONFIRM
  EXIT_STDERR
  EXIT_TCPWRAP
  EXIT_PAM
  EXIT_NETWORK
  EXIT_NAMESPACE
  EXIT_NO_NEW_PRIVILEGES
  EXIT_SECCOMP
  EXIT_STATUS_MINIMAL
  EXIT_STATUS_SYSTEMD
  EXIT_STATUS_LSB
  EXIT_STATUS_FULL
  HASHMAP_FOREACH_KEY
  HASHMAP_FOREACH_BACKWARDS
  FORMAT_TIMESTAMP_MAX
  FORMAT_TIMESTAMP_PRETTY_MAX
  FORMAT_TIMESPAN_MAX
  FORMAT_BYTES_MAX
  ANSI_HIGHLIGHT_ON
  ANSI_RED_ON
  ANSI_HIGHLIGHT_RED_ON
  dual_timestamp_is_set
  newa
  newdup
  FOREACH_WORD
  FOREACH_WORD_SEPARATOR
  NULSTR_FOREACH
  _cleanup_pclose_
  _cleanup_umask_
  _cleanup_globfree_
  DRAW_TREE_VERT
  DRAW_TREE_BRANCH
  DRAW_TREE_RIGHT
  DRAW_TREE_SPACE
  DRAW_TRIANGULAR_BULLET
  _DRAW_SPECIAL_CHAR_MAX
  FOREACH_LINE
  procfs_file_alloca

The following unused struct defs were removed:

  struct ExitStatusSet

The following unused static inline funcs were remvoed:

  static inline int safe_atolu
  static inline int safe_atoli
  static inline int safe_atolu
  static inline int safe_atoli
  static inline int safe_atou32
  static inline int safe_atoi32
  static inline int safe_atou64
  static inline int safe_atoi64
  static inline const char* yes_no
  static inline const char* strempty
  static inline const char* strnull
  static inline const char *strna
  static inline void pclosep
  static inline void umaskp

NOTE: Some unused DECLS were retained if they formed part of a logical
series, eg. definition of time units.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-06 18:19:05 -04:00
Anthony G. Basile
afe76217f9 Round 4 of remove unused functions from src/libudev/{hashmap,log,set,util}.c
We removed the following functions:

  hashmap_merge
  path_is_read_only_fs
  set_free_free
  set_free_freep
  readlink_malloc
  hexchar
  unhexchar
  octchar
  unoctchar
  format_timespan

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-06 10:39:11 -04:00
Anthony G. Basile
6f8f3edfe8 Round 3 of remove unused functions from src/libudev/{conf-files,hashmap,util}
The following functions were removed:
  strv_env_get_n
  strv_env_get
  conf_files_list
  hashmap_remove
  hashmap_move
  log_dump_internal
  parse_uid
  read_full_file
  strstrip
  file_in_same_dir
  cunescape
  cunescape_length
  cunescape_length_with_prefix
  xescape
  dirent_is_file
  close_all_fds
  read_one_char
  ask
  reset_terminal_fd
  reset_terminal
  flush_fd
  loop_read
  get_ctty_devnr
  get_ctty
  rm_rf_children
  rm_rf_children_dangerous
  rm_rf
  status_vprintf
  fd_columns
  columns
  fd_lines
  lines
  on_tty
  ellipsize
  ellipsize_mem
  touch
  unquote
  resolve_dev_console
  tty_is_vc
  vtnr_from_tty
  terminal_vhangup_fd
  terminal_vhangup
  file_is_priv_sticky
  signal_from_string
  fd_wait_for_event
  memdup
  memdup_multiply

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-06 00:18:45 -04:00
Anthony G. Basile
ac6af14544 Round 2 of remove unused functions from src/libudev/{hashmap,log,path-util,set,strv,util}
We remove the following functions:

  cleanup_pool
  uint64_hash_func
  hashmap_ensure_allocated
  hashmap_clear_free_free
  hashmap_replace
  hashmap_remove_and_put
  hashmap_iterate_skip
  hashmap_first
  hashmap_first_key
  hashmap_last
  hashmap_isempty
  hashmap_move_one
  hashmap_copy
  log_metav_object
  log_show_color
  log_show_location
  path_strv_make_absolute_cwd
  path_startswith
  set_remove
  set_move
  set_clear
  strv_find
  strv_contains
  strv_merge
  strv_split
  strv_split_quoted
  strv_append
  strv_extend
  strv_push
  strv_split_nulstr
  str_compare
  dual_timestamp_get
  dual_timestamp_from_realtime
  timespec_store
  timeval_load
  timeval_store
  parse_boolean
  fchmod_umask
  parse_env_file
  get_process_comm
  get_process_id
  readlink_and_make_absolute
  bus_path_unescape
  format_timestamp
  acquire_terminal
  loop_write
  parse_usec
  make_stdio
  random_ull
  lookup_uid
  getttyname_malloc
  status_printf
  replace_env
  normalize_env_assignment
  wait_for_terminate
  freeze
  tag_to_udev_node
  tty_is_vc_resolve
  nulstr_contains
  strshorten
  hostname_valid_char
  display_is_local
  get_group_creds
  in_gid
  dirent_ensure_type
  is_locale_utf8

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2013-06-05 22:30:19 -04:00