projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add non-root support for UST tracing
[lttng-tools.git]
/
lttng-consumerd
/
lttng-consumerd.c
diff --git
a/lttng-consumerd/lttng-consumerd.c
b/lttng-consumerd/lttng-consumerd.c
index dce188aced643c282f71f4f7d114ad92f05374e8..cf515a9df7cae5090f4f2537b1fda39342fcfffc 100644
(file)
--- a/
lttng-consumerd/lttng-consumerd.c
+++ b/
lttng-consumerd/lttng-consumerd.c
@@
-251,13
+251,16
@@
int main(int argc, char **argv)
if (strlen(command_sock_path) == 0) {
switch (opt_type) {
case LTTNG_CONSUMER_KERNEL:
if (strlen(command_sock_path) == 0) {
switch (opt_type) {
case LTTNG_CONSUMER_KERNEL:
- strcpy(command_sock_path, KCONSUMERD_CMD_SOCK_PATH);
+ snprintf(command_sock_path, PATH_MAX, KCONSUMERD_CMD_SOCK_PATH,
+ LTTNG_RUNDIR);
break;
case LTTNG_CONSUMER64_UST:
break;
case LTTNG_CONSUMER64_UST:
- strcpy(command_sock_path, USTCONSUMERD64_CMD_SOCK_PATH);
+ snprintf(command_sock_path, PATH_MAX,
+ USTCONSUMERD64_CMD_SOCK_PATH, LTTNG_RUNDIR);
break;
case LTTNG_CONSUMER32_UST:
break;
case LTTNG_CONSUMER32_UST:
- strcpy(command_sock_path, USTCONSUMERD32_CMD_SOCK_PATH);
+ snprintf(command_sock_path, PATH_MAX,
+ USTCONSUMERD32_CMD_SOCK_PATH, LTTNG_RUNDIR);
break;
default:
WARN("Unknown consumerd type");
break;
default:
WARN("Unknown consumerd type");
@@
-275,13
+278,16
@@
int main(int argc, char **argv)
if (strlen(error_sock_path) == 0) {
switch (opt_type) {
case LTTNG_CONSUMER_KERNEL:
if (strlen(error_sock_path) == 0) {
switch (opt_type) {
case LTTNG_CONSUMER_KERNEL:
- strcpy(error_sock_path, KCONSUMERD_ERR_SOCK_PATH);
+ snprintf(error_sock_path, PATH_MAX, KCONSUMERD_ERR_SOCK_PATH,
+ LTTNG_RUNDIR);
break;
case LTTNG_CONSUMER64_UST:
break;
case LTTNG_CONSUMER64_UST:
- strcpy(error_sock_path, USTCONSUMERD64_ERR_SOCK_PATH);
+ snprintf(error_sock_path, PATH_MAX,
+ USTCONSUMERD64_ERR_SOCK_PATH, LTTNG_RUNDIR);
break;
case LTTNG_CONSUMER32_UST:
break;
case LTTNG_CONSUMER32_UST:
- strcpy(error_sock_path, USTCONSUMERD32_ERR_SOCK_PATH);
+ snprintf(error_sock_path, PATH_MAX,
+ USTCONSUMERD32_ERR_SOCK_PATH, LTTNG_RUNDIR);
break;
default:
WARN("Unknown consumerd type");
break;
default:
WARN("Unknown consumerd type");
This page took
0.024568 seconds
and
4
git commands to generate.