Clean-up: utils: make utils_partial_realpath static

[lttng-tools.git] / src / common / utils.c

diff --git a/src/common/utils.c b/src/common/utils.c
index a068e410b4bf26800d38e5807a0fb06c884f70d6..ef22144d4e8637ddf15af3f456c11e0a10585efd 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -65,7 +65,7 @@
  * to specify the size of the resolved_path argument if given, or the size to
  * allocate.
  */
-LTTNG_HIDDEN
+static
 char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
 {
        char *cut_path = NULL, *try_path = NULL, *try_path_prev = NULL;
@@ -294,7 +294,7 @@ int expand_double_slashes_dot_and_dotdot(char *path)
                 * Copy the current token which is neither a '.' nor a '..'.
                 */
                path[expanded_path_len++] = '/';
-               memcpy(&path[expanded_path_len], curr_char, curr_token_len);
+               memmove(&path[expanded_path_len], curr_char, curr_token_len);
                expanded_path_len += curr_token_len;
        }
 
@@ -679,8 +679,8 @@ int utils_mkdir(const char *path, mode_t mode, int uid, int gid)
        int ret;
        struct lttng_directory_handle *handle;
        const struct lttng_credentials creds = {
-               .uid = (uid_t) uid,
-               .gid = (gid_t) gid,
+               .uid = LTTNG_OPTIONAL_INIT_VALUE(uid),
+               .gid = LTTNG_OPTIONAL_INIT_VALUE(gid),
        };
 
        handle = lttng_directory_handle_create(NULL);
@@ -708,8 +708,8 @@ int utils_mkdir_recursive(const char *path, mode_t mode, int uid, int gid)
        int ret;
        struct lttng_directory_handle *handle;
        const struct lttng_credentials creds = {
-               .uid = (uid_t) uid,
-               .gid = (gid_t) gid,
+               .uid = LTTNG_OPTIONAL_INIT_VALUE(uid),
+               .gid = LTTNG_OPTIONAL_INIT_VALUE(gid),
        };
 
        handle = lttng_directory_handle_create(NULL);
@@ -1274,8 +1274,14 @@ int utils_get_group_id(const char *name, bool warn, gid_t *gid)
                }
        }
        if (ret) {
-               PERROR("Failed to get group file entry for group name \"%s\"",
-                               name);
+               if (ret == ESRCH) {
+                       DBG("Could not find group file entry for group name '%s'",
+                                       name);
+               } else {
+                       PERROR("Failed to get group file entry for group name '%s'",
+                                       name);
+               }
+
                ret = -1;
                goto error;
        }
@@ -1663,3 +1669,39 @@ end:
        free(buf);
        return ret_val;
 }
+
+LTTNG_HIDDEN
+int utils_parse_unsigned_long_long(const char *str,
+               unsigned long long *value)
+{
+       int ret;
+       char *endptr;
+
+       assert(str);
+       assert(value);
+
+       errno = 0;
+       *value = strtoull(str, &endptr, 10);
+
+       /* Conversion failed. Out of range? */
+       if (errno != 0) {
+               /* Don't print an error; allow the caller to log a better error. */
+               DBG("Failed to parse string as unsigned long long number: string = '%s', errno = %d",
+                               str, errno);
+               ret = -1;
+               goto end;
+       }
+
+       /* Not the end of the string or empty string. */
+       if (*endptr || endptr == str) {
+               DBG("Failed to parse string as unsigned long long number: string = '%s'",
+                               str);
+               ret = -1;
+               goto end;
+       }
+
+       ret = 0;
+
+end:
+       return ret;
+}