diff options
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/def.h | 4 | ||||
| -rw-r--r-- | src/shared/dev-setup.c | 16 | ||||
| -rw-r--r-- | src/shared/dev-setup.h | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/shared/def.h b/src/shared/def.h index ac325bf8f9..a2304fddda 100644 --- a/src/shared/def.h +++ b/src/shared/def.h @@ -71,3 +71,7 @@ #define UNIX_USER_BUS_FMT "unix:path=%s/bus" #define KERNEL_USER_BUS_FMT "kernel:path=/dev/kdbus/%lu-user/bus" + +#ifndef TTY_GID +#define TTY_GID 5 +#endif diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c index 50a187fda9..e025e17bbe 100644 --- a/src/shared/dev-setup.c +++ b/src/shared/dev-setup.c @@ -50,7 +50,7 @@ static int symlink_and_label(const char *old_path, const char *new_path) { return r; } -void dev_setup(const char *prefix) { +int dev_setup(const char *prefix) { const char *j, *k; static const char symlinks[] = @@ -69,16 +69,16 @@ void dev_setup(const char *prefix) { } if (prefix) { - char *linkname; + _cleanup_free_ char *link_name = NULL; - if (asprintf(&linkname, "%s/%s", prefix, k) < 0) { - log_oom(); - break; - } + link_name = strjoin(prefix, "/", k, NULL); + if (!link_name) + return -ENOMEM; - symlink_and_label(j, linkname); - free(linkname); + symlink_and_label(j, link_name); } else symlink_and_label(j, k); } + + return 0; } diff --git a/src/shared/dev-setup.h b/src/shared/dev-setup.h index 320c0b30ba..d41b6eefba 100644 --- a/src/shared/dev-setup.h +++ b/src/shared/dev-setup.h @@ -21,4 +21,4 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -void dev_setup(const char *pathprefix); +int dev_setup(const char *pathprefix); |