projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: agent port file is o+w when launching as root
[lttng-tools.git]
/
src
/
common
/
utils.cpp
diff --git
a/src/common/utils.cpp
b/src/common/utils.cpp
index eb6b001434300594b3f0af974f565b0d2301959c..6c0fd261c7b8a4033d5eb35cc7247af509ddfca3 100644
(file)
--- a/
src/common/utils.cpp
+++ b/
src/common/utils.cpp
@@
-171,9
+171,8
@@
void utils_close_pipe(int *src)
*/
char *utils_strdupdelim(const char *begin, const char *end)
{
*/
char *utils_strdupdelim(const char *begin, const char *end)
{
- char *str;
+ char *str
= zmalloc<char>(end - begin + 1)
;
- str = (char *) zmalloc(end - begin + 1);
if (str == NULL) {
PERROR("zmalloc strdupdelim");
goto error;
if (str == NULL) {
PERROR("zmalloc strdupdelim");
goto error;
@@
-213,30
+212,40
@@
end:
*/
int utils_create_pid_file(pid_t pid, const char *filepath)
{
*/
int utils_create_pid_file(pid_t pid, const char *filepath)
{
- int ret;
- FILE *fp;
+ int ret
, fd = -1
;
+ FILE *fp
= NULL
;
LTTNG_ASSERT(filepath);
LTTNG_ASSERT(filepath);
- fp = fopen(filepath, "w");
+ fd = open(filepath, O_CREAT | O_WRONLY, S_IRUSR |S_IWUSR | S_IRGRP | S_IROTH);
+ if (fd < 0) {
+ PERROR("open file %s", filepath);
+ ret = -1;
+ goto error;
+ }
+
+ fp = fdopen(fd, "w");
if (fp == NULL) {
if (fp == NULL) {
- PERROR("
open pid
file %s", filepath);
+ PERROR("
fdopen
file %s", filepath);
ret = -1;
ret = -1;
+ close(fd);
goto error;
}
ret = fprintf(fp, "%d\n", (int) pid);
if (ret < 0) {
goto error;
}
ret = fprintf(fp, "%d\n", (int) pid);
if (ret < 0) {
- PERROR("fprintf pid file");
+ PERROR("fprintf file %s", filepath);
+ ret = -1;
goto error;
}
goto error;
}
- if (fclose(fp)) {
- PERROR("fclose");
- }
- DBG("Pid %d written in file %s", (int) pid, filepath);
+ DBG("'%d' written in file %s", (int) pid, filepath);
ret = 0;
ret = 0;
+
error:
error:
+ if (fp && fclose(fp)) {
+ PERROR("fclose file %s", filepath);
+ }
return ret;
}
return ret;
}
@@
-784,7
+793,7
@@
char *utils_get_user_home_dir(uid_t uid)
goto end;
}
retry:
goto end;
}
retry:
- buf =
(char *) zmalloc
(buflen);
+ buf =
zmalloc<char>
(buflen);
if (!buf) {
goto end;
}
if (!buf) {
goto end;
}
@@
-934,7
+943,7
@@
char *utils_generate_optstring(const struct option *long_options,
string_len += long_options[i].has_arg ? 1 : 0;
}
string_len += long_options[i].has_arg ? 1 : 0;
}
- optstring =
(char *) zmalloc
(string_len);
+ optstring =
zmalloc<char>
(string_len);
if (!optstring) {
goto end;
}
if (!optstring) {
goto end;
}
@@
-1159,7
+1168,7
@@
enum lttng_error_code utils_user_id_from_name(const char *user_name, uid_t *uid)
buflen = FALLBACK_USER_BUFLEN;
}
buflen = FALLBACK_USER_BUFLEN;
}
- buf =
(char *) zmalloc
(buflen);
+ buf =
zmalloc<char>
(buflen);
if (!buf) {
ret_val = LTTNG_ERR_NOMEM;
goto end;
if (!buf) {
ret_val = LTTNG_ERR_NOMEM;
goto end;
@@
-1173,7
+1182,7
@@
enum lttng_error_code utils_user_id_from_name(const char *user_name, uid_t *uid)
case ERANGE:
buflen *= 2;
free(buf);
case ERANGE:
buflen *= 2;
free(buf);
- buf =
(char *) zmalloc
(buflen);
+ buf =
zmalloc<char>
(buflen);
if (!buf) {
ret_val = LTTNG_ERR_NOMEM;
goto end;
if (!buf) {
ret_val = LTTNG_ERR_NOMEM;
goto end;
@@
-1224,7
+1233,7
@@
enum lttng_error_code utils_group_id_from_name(
buflen = FALLBACK_GROUP_BUFLEN;
}
buflen = FALLBACK_GROUP_BUFLEN;
}
- buf =
(char *) zmalloc
(buflen);
+ buf =
zmalloc<char>
(buflen);
if (!buf) {
ret_val = LTTNG_ERR_NOMEM;
goto end;
if (!buf) {
ret_val = LTTNG_ERR_NOMEM;
goto end;
@@
-1238,7
+1247,7
@@
enum lttng_error_code utils_group_id_from_name(
case ERANGE:
buflen *= 2;
free(buf);
case ERANGE:
buflen *= 2;
free(buf);
- buf =
(char *) zmalloc
(buflen);
+ buf =
zmalloc<char>
(buflen);
if (!buf) {
ret_val = LTTNG_ERR_NOMEM;
goto end;
if (!buf) {
ret_val = LTTNG_ERR_NOMEM;
goto end;
This page took
0.026189 seconds
and
4
git commands to generate.