chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: sync kdbus.h (API break)
[elogind.git]
/
src
/
login
/
sysfs-show.c
diff --git
a/src/login/sysfs-show.c
b/src/login/sysfs-show.c
index b8b356d77b1945ddcb4adf57340e45384d66ff77..9bd9152bed3cef9406bc9ef31060fc2fe781f10a 100644
(file)
--- a/
src/login/sysfs-show.c
+++ b/
src/login/sysfs-show.c
@@
-6,16
+6,16
@@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU
Lesser
General Public License as published by
+ the Free Software Foundation; either version 2
.1
of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+
Lesser
General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU
Lesser
General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
@@
-25,6
+25,8
@@
#include "util.h"
#include "sysfs-show.h"
#include "util.h"
#include "sysfs-show.h"
+#include "path-util.h"
+#include "udev-util.h"
static int show_sysfs_one(
struct udev *udev,
static int show_sysfs_one(
struct udev *udev,
@@
-40,10
+42,11
@@
static int show_sysfs_one(
assert(prefix);
while (*item) {
assert(prefix);
while (*item) {
+ _cleanup_udev_device_unref_ struct udev_device *d = NULL;
struct udev_list_entry *next, *lookahead;
struct udev_list_entry *next, *lookahead;
- struct udev_device *d;
const char *sn, *name, *sysfs, *subsystem, *sysname;
const char *sn, *name, *sysfs, *subsystem, *sysname;
- char *l, *k;
+ _cleanup_free_ char *k = NULL, *l = NULL;
+ bool is_master;
sysfs = udev_list_entry_get_name(*item);
if (!path_startswith(sysfs, sub))
sysfs = udev_list_entry_get_name(*item);
if (!path_startswith(sysfs, sub))
@@
-59,13
+62,14
@@
static int show_sysfs_one(
if (isempty(sn))
sn = "seat0";
if (isempty(sn))
sn = "seat0";
- /*
fixme,
also check for tag 'seat' here */
+ /*
Explicitly
also check for tag 'seat' here */
if (!streq(seat, sn) || !udev_device_has_tag(d, "seat")) {
if (!streq(seat, sn) || !udev_device_has_tag(d, "seat")) {
- udev_device_unref(d);
*item = udev_list_entry_get_next(*item);
continue;
}
*item = udev_list_entry_get_next(*item);
continue;
}
+ is_master = udev_device_has_tag(d, "master-of-seat");
+
name = udev_device_get_sysattr_value(d, "name");
if (!name)
name = udev_device_get_sysattr_value(d, "id");
name = udev_device_get_sysattr_value(d, "name");
if (!name)
name = udev_device_get_sysattr_value(d, "id");
@@
-81,21
+85,17
@@
static int show_sysfs_one(
if (path_startswith(lookahead_sysfs, sub) &&
!path_startswith(lookahead_sysfs, sysfs)) {
if (path_startswith(lookahead_sysfs, sub) &&
!path_startswith(lookahead_sysfs, sysfs)) {
-
struct udev_device *lookahead_d
;
+
_cleanup_udev_device_unref_ struct udev_device *lookahead_d = NULL
;
lookahead_d = udev_device_new_from_syspath(udev, lookahead_sysfs);
if (lookahead_d) {
const char *lookahead_sn;
lookahead_d = udev_device_new_from_syspath(udev, lookahead_sysfs);
if (lookahead_d) {
const char *lookahead_sn;
- bool found;
lookahead_sn = udev_device_get_property_value(d, "ID_SEAT");
if (isempty(lookahead_sn))
lookahead_sn = "seat0";
lookahead_sn = udev_device_get_property_value(d, "ID_SEAT");
if (isempty(lookahead_sn))
lookahead_sn = "seat0";
- found = streq(seat, lookahead_sn) && udev_device_has_tag(lookahead_d, "seat");
- udev_device_unref(lookahead_d);
-
- if (found)
+ if (streq(seat, lookahead_sn) && udev_device_has_tag(lookahead_d, "seat"))
break;
}
}
break;
}
}
@@
-104,41
+104,44
@@
static int show_sysfs_one(
}
k = ellipsize(sysfs, n_columns, 20);
}
k = ellipsize(sysfs, n_columns, 20);
- printf("%s%s %s\n", prefix, lookahead ? "\342\224\234" : "\342\224\224", k ? k : sysfs);
- free(k);
+ if (!k)
+ return -ENOMEM;
+
+ printf("%s%s%s\n", prefix, draw_special_char(lookahead ? DRAW_TREE_BRANCH : DRAW_TREE_RIGHT), k);
if (asprintf(&l,
if (asprintf(&l,
- "(%s:%s)%s%s%s",
+ "%s%s:%s%s%s%s",
+ is_master ? "[MASTER] " : "",
subsystem, sysname,
subsystem, sysname,
- name ? " \"" : "", name ? name : "", name ? "\"" : "") < 0) {
- udev_device_unref(d);
+ name ? " \"" : "", name ? name : "", name ? "\"" : "") < 0)
return -ENOMEM;
return -ENOMEM;
- }
- k = ellipsize(l, n_columns, 70);
- printf("%s%s %s\n", prefix, lookahead ? "\342\224\202" : " ", k ? k : l);
free(k);
free(k);
- free(l);
+ k = ellipsize(l, n_columns, 70);
+ if (!k)
+ return -ENOMEM;
+
+ printf("%s%s%s\n", prefix, lookahead ? draw_special_char(DRAW_TREE_VERTICAL) : " ", k);
*item = next;
if (*item) {
*item = next;
if (*item) {
-
char *p
;
+
_cleanup_free_ char *p = NULL
;
- p = strappend(prefix, lookahead ? "\342\224\202 " : " ");
- show_sysfs_one(udev, seat, item, sysfs, p ? p : prefix, n_columns - 2);
- free(p);
- }
+ p = strappend(prefix, lookahead ? draw_special_char(DRAW_TREE_VERTICAL) : " ");
+ if (!p)
+ return -ENOMEM;
- udev_device_unref(d);
+ show_sysfs_one(udev, seat, item, sysfs, p, n_columns - 2);
+ }
}
return 0;
}
int show_sysfs(const char *seat, const char *prefix, unsigned n_columns) {
}
return 0;
}
int show_sysfs(const char *seat, const char *prefix, unsigned n_columns) {
- struct udev *udev;
+ _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL;
+ _cleanup_udev_unref_ struct udev *udev = NULL;
struct udev_list_entry *first = NULL;
struct udev_list_entry *first = NULL;
- struct udev_enumerate *e;
int r;
if (n_columns <= 0)
int r;
if (n_columns <= 0)
@@
-155,33
+158,29
@@
int show_sysfs(const char *seat, const char *prefix, unsigned n_columns) {
return -ENOMEM;
e = udev_enumerate_new(udev);
return -ENOMEM;
e = udev_enumerate_new(udev);
- if (!e) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!e)
+ return -ENOMEM;
if (!streq(seat, "seat0"))
r = udev_enumerate_add_match_tag(e, seat);
else
r = udev_enumerate_add_match_tag(e, "seat");
if (!streq(seat, "seat0"))
r = udev_enumerate_add_match_tag(e, seat);
else
r = udev_enumerate_add_match_tag(e, "seat");
+ if (r < 0)
+ return r;
+ r = udev_enumerate_add_match_is_initialized(e);
if (r < 0)
if (r < 0)
-
goto finish
;
+
return r
;
r = udev_enumerate_scan_devices(e);
if (r < 0)
r = udev_enumerate_scan_devices(e);
if (r < 0)
-
goto finish
;
+
return r
;
first = udev_enumerate_get_list_entry(e);
if (first)
show_sysfs_one(udev, seat, &first, "/", prefix, n_columns);
first = udev_enumerate_get_list_entry(e);
if (first)
show_sysfs_one(udev, seat, &first, "/", prefix, n_columns);
-
-finish:
- if (e)
- udev_enumerate_unref(e);
-
- if (udev)
- udev_unref(udev);
+ else
+ printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_RIGHT), "(none)");
return r;
}
return r;
}