SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6582 from poettering/logind-tty

Browse Source 
various tty path parsing fixes
This commit is contained in:
Yu Watanabe
2017-08-26 22:12:48 +09:00
committed by GitHub
parent 0f52f8e552 c9ed61e7a0
commit 5ce96b141a
11 changed files with 59 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/path-util.h
+10
View File
@@ -143,3 +143,13 @@ bool is_deviceallow_pattern(const char *path);
int systemd_installation_has_version(const char *root, unsigned minimal_version);
bool dot_or_dot_dot(const char *path);
static inline const char *skip_dev_prefix(const char *p) {
const char *e;
/* Drop any /dev prefix if there is any */
e = path_startswith(p, "/dev/");
return e ?: p;
}
src/basic/terminal-util.c
+11 -14
View File
@@ -55,6 +55,7 @@
#include "terminal-util.h"
#include "time-util.h"
#include "util.h"
#include "path-util.h"
static volatile unsigned cached_columns = 0;
static volatile unsigned cached_lines = 0;
@@ -556,6 +557,7 @@ int terminal_vhangup(const char *name) {
int vt_disallocate(const char *name) {
_cleanup_close_ int fd = -1;
const char *e, *n;
unsigned u;
int r;
@@ -563,7 +565,8 @@ int vt_disallocate(const char *name) {
* (i.e. because it is the active one), at least clear it
* entirely (including the scrollback buffer) */
if (!startswith(name, "/dev/"))
e = path_startswith(name, "/dev/");
if (!e)
return -EINVAL;
if (!tty_is_vc(name)) {
@@ -582,10 +585,11 @@ int vt_disallocate(const char *name) {
return 0;
}
if (!startswith(name, "/dev/tty"))
n = startswith(e, "tty");
if (!n)
return -EINVAL;
r = safe_atou(name+8, &u);
r = safe_atou(n, &u);
if (r < 0)
return r;
@@ -649,10 +653,7 @@ bool tty_is_vc(const char *tty) {
bool tty_is_console(const char *tty) {
assert(tty);
if (startswith(tty, "/dev/"))
tty += 5;
return streq(tty, "console");
return streq(skip_dev_prefix(tty), "console");
}
int vtnr_from_tty(const char *tty) {
@@ -660,8 +661,7 @@ int vtnr_from_tty(const char *tty) {
assert(tty);
if (startswith(tty, "/dev/"))
tty += 5;
tty = skip_dev_prefix(tty);
if (!startswith(tty, "tty") )
return -EINVAL;
@@ -775,8 +775,7 @@ bool tty_is_vc_resolve(const char *tty) {
assert(tty);
if (startswith(tty, "/dev/"))
tty += 5;
tty = skip_dev_prefix(tty);
if (streq(tty, "console")) {
tty = resolve_dev_console(&active);
@@ -918,11 +917,9 @@ int getttyname_malloc(int fd, char **ret) {
r = ttyname_r(fd, path, sizeof(path));
if (r == 0) {
const char *p;
char *c;
p = startswith(path, "/dev/");
c = strdup(p ?: path);
c = strdup(skip_dev_prefix(path));
if (!c)
return -ENOMEM;
src/core/cgroup.c
+1 -1
View File
@@ -949,7 +949,7 @@ static void cgroup_context_apply(Unit *u, CGroupMask mask, ManagerState state) {
acc[k++] = 0;
if (startswith(a->path, "/dev/"))
if (path_startswith(a->path, "/dev/"))
whitelist_device(path, a->path, acc);
else if ((val = startswith(a->path, "block-")))
whitelist_major(path, val, 'b', acc);
src/core/dbus-cgroup.c
+2 -2
View File
@@ -1018,8 +1018,8 @@ int bus_cgroup_set_property(
while ((r = sd_bus_message_read(message, "(ss)", &path, &rwm)) > 0) {
if ((!startswith(path, "/dev/") &&
!startswith(path, "/run/systemd/inaccessible/") &&
if ((!path_startswith(path, "/dev/") &&
!path_startswith(path, "/run/systemd/inaccessible/") &&
!startswith(path, "block-") &&
!startswith(path, "char-")) ||
strpbrk(path, WHITESPACE))
src/core/execute.c
+1 -2
View File
@@ -3440,8 +3440,7 @@ static bool tty_may_match_dev_console(const char *tty) {
if (!tty)
return true;
if (startswith(tty, "/dev/"))
tty += 5;
tty = skip_dev_prefix(tty);
/* trivial identity? */
if (streq(tty, "console"))
src/login/logind-utmp.c
+8 -3
View File
@@ -31,6 +31,7 @@
#include "bus-util.h"
#include "format-util.h"
#include "logind.h"
#include "path-util.h"
#include "special.h"
#include "strv.h"
#include "unit-name.h"
@@ -60,15 +61,19 @@ _const_ static usec_t when_wall(usec_t n, usec_t elapse) {
}
bool logind_wall_tty_filter(const char *tty, void *userdata) {
Manager *m = userdata;
const char *p;
assert(m);
if (!startswith(tty, "/dev/") || !m->scheduled_shutdown_tty)
if (!m->scheduled_shutdown_tty)
return true;
return !streq(tty + 5, m->scheduled_shutdown_tty);
p = path_startswith(tty, "/dev/");
if (!p)
return true;
return !streq(p, m->scheduled_shutdown_tty);
}
static int warn_wall(Manager *m, usec_t n) {
src/login/pam_systemd.c
+4 -1
View File
@@ -46,6 +46,7 @@
#include "strv.h"
#include "terminal-util.h"
#include "util.h"
#include "path-util.h"
static int parse_argv(
pam_handle_t *handle,
@@ -335,7 +336,9 @@ _public_ PAM_EXTERN int pam_sm_open_session(
type ="tty";
class = "user";
tty = NULL;
}
} else
/* Chop off leading /dev prefix that some clients specify, but others do not. */
tty = skip_dev_prefix(tty);
/* If this fails vtnr will be 0, that's intended */
if (!isempty(cvtnr))
src/sysctl/sysctl.c
+1 -1
View File
@@ -223,7 +223,7 @@ static int parse_argv(int argc, char *argv[]) {
* sysctl name available. */
sysctl_normalize(optarg);
if (startswith(optarg, "/proc/sys"))
if (path_startswith(optarg, "/proc/sys"))
p = strdup(optarg);
else
p = strappend("/proc/sys/", optarg);
src/test/test-path-util.c
+16
View File
@@ -588,6 +588,21 @@ static void test_systemd_installation_has_version(const char *path) {
}
}
static void test_skip_dev_prefix(void) {
assert_se(streq(skip_dev_prefix("/"), "/"));
assert_se(streq(skip_dev_prefix("/dev"), ""));
assert_se(streq(skip_dev_prefix("/dev/"), ""));
assert_se(streq(skip_dev_prefix("/dev/foo"), "foo"));
assert_se(streq(skip_dev_prefix("/dev/foo/bar"), "foo/bar"));
assert_se(streq(skip_dev_prefix("//dev"), ""));
assert_se(streq(skip_dev_prefix("//dev//"), ""));
assert_se(streq(skip_dev_prefix("/dev///foo"), "foo"));
assert_se(streq(skip_dev_prefix("///dev///foo///bar"), "foo///bar"));
assert_se(streq(skip_dev_prefix("//foo"), "//foo"));
assert_se(streq(skip_dev_prefix("foo"), "foo"));
}
int main(int argc, char **argv) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
@@ -607,6 +622,7 @@ int main(int argc, char **argv) {
test_file_in_same_dir();
test_filename_is_valid();
test_hidden_or_backup_file();
test_skip_dev_prefix();
test_systemd_installation_has_version(argv[1]); /* NULL is OK */
src/udev/udevadm-test-builtin.c
+2 -1
View File
@@ -21,6 +21,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "path-util.h"
#include "string-util.h"
#include "udev.h"
@@ -80,7 +81,7 @@ static int adm_builtin(struct udev *udev, int argc, char *argv[]) {
}
/* add /sys if needed */
if (!startswith(syspath, "/sys"))
if (!path_startswith(syspath, "/sys"))
strscpyl(filename, sizeof(filename), "/sys", syspath, NULL);
else
strscpy(filename, sizeof(filename), syspath);
src/udev/udevadm-util.c
+3 -2
View File
@@ -15,6 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "path-util.h"
#include "string-util.h"
#include "udevadm-util.h"
@@ -28,7 +29,7 @@ struct udev_device *find_device(struct udev *udev,
if (prefix && !startswith(id, prefix))
id = strjoina(prefix, id);
if (startswith(id, "/dev/")) {
if (path_startswith(id, "/dev/")) {
struct stat statbuf;
char type;
@@ -43,7 +44,7 @@ struct udev_device *find_device(struct udev *udev,
return NULL;
return udev_device_new_from_devnum(udev, type, statbuf.st_rdev);
} else if (startswith(id, "/sys/"))
} else if (path_startswith(id, "/sys/"))
return udev_device_new_from_syspath(udev, id);
else
return NULL;