util.c is the proper place for those functions.
This commit is contained in:
parent
3669bcbd5f
commit
68f906f278
|
@ -129,9 +129,6 @@ struct Config {
|
||||||
} bar;
|
} bar;
|
||||||
};
|
};
|
||||||
|
|
||||||
char *resolve_tilde(const char *path);
|
|
||||||
bool path_exists(const char *path);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reads the configuration from ~/.i3/config or /etc/i3/config if not found.
|
* Reads the configuration from ~/.i3/config or /etc/i3/config if not found.
|
||||||
*
|
*
|
||||||
|
|
|
@ -103,6 +103,20 @@ void check_error(xcb_connection_t *conn, xcb_void_cookie_t cookie,
|
||||||
*/
|
*/
|
||||||
char *convert_utf8_to_ucs2(char *input, int *real_strlen);
|
char *convert_utf8_to_ucs2(char *input, int *real_strlen);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function resolves ~ in pathnames.
|
||||||
|
* It may resolve wildcards in the first part of the path, but if no match
|
||||||
|
* or multiple matches are found, it just returns a copy of path as given.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
char *resolve_tilde(const char *path);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Checks if the given path exists by calling stat().
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
bool path_exists(const char *path);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Restart i3 in-place
|
* Restart i3 in-place
|
||||||
* appends -a to argument list to disable autostart
|
* appends -a to argument list to disable autostart
|
||||||
|
|
41
src/config.c
41
src/config.c
|
@ -22,47 +22,6 @@
|
||||||
Config config;
|
Config config;
|
||||||
struct modes_head modes;
|
struct modes_head modes;
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This function resolves ~ in pathnames.
|
|
||||||
* It may resolve wildcards in the first part of the path, but if no match
|
|
||||||
* or multiple matches are found, it just returns a copy of path as given.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
char *resolve_tilde(const char *path) {
|
|
||||||
static glob_t globbuf;
|
|
||||||
char *head, *tail, *result;
|
|
||||||
|
|
||||||
tail = strchr(path, '/');
|
|
||||||
head = strndup(path, tail ? tail - path : strlen(path));
|
|
||||||
|
|
||||||
int res = glob(head, GLOB_TILDE, NULL, &globbuf);
|
|
||||||
free(head);
|
|
||||||
/* no match, or many wildcard matches are bad */
|
|
||||||
if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
|
|
||||||
result = sstrdup(path);
|
|
||||||
else if (res != 0) {
|
|
||||||
die("glob() failed");
|
|
||||||
} else {
|
|
||||||
head = globbuf.gl_pathv[0];
|
|
||||||
result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1);
|
|
||||||
strncpy(result, head, strlen(head));
|
|
||||||
strncat(result, tail, strlen(tail));
|
|
||||||
}
|
|
||||||
globfree(&globbuf);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Checks if the given path exists by calling stat().
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
bool path_exists(const char *path) {
|
|
||||||
struct stat buf;
|
|
||||||
return (stat(path, &buf) == 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ungrabs all keys, to be called before re-grabbing the keys because of a
|
* Ungrabs all keys, to be called before re-grabbing the keys because of a
|
||||||
* mapping_notify event or a configuration file reload
|
* mapping_notify event or a configuration file reload
|
||||||
|
|
40
src/util.c
40
src/util.c
|
@ -175,6 +175,46 @@ char *convert_utf8_to_ucs2(char *input, int *real_strlen) {
|
||||||
return buffer;
|
return buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function resolves ~ in pathnames.
|
||||||
|
* It may resolve wildcards in the first part of the path, but if no match
|
||||||
|
* or multiple matches are found, it just returns a copy of path as given.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
char *resolve_tilde(const char *path) {
|
||||||
|
static glob_t globbuf;
|
||||||
|
char *head, *tail, *result;
|
||||||
|
|
||||||
|
tail = strchr(path, '/');
|
||||||
|
head = strndup(path, tail ? tail - path : strlen(path));
|
||||||
|
|
||||||
|
int res = glob(head, GLOB_TILDE, NULL, &globbuf);
|
||||||
|
free(head);
|
||||||
|
/* no match, or many wildcard matches are bad */
|
||||||
|
if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
|
||||||
|
result = sstrdup(path);
|
||||||
|
else if (res != 0) {
|
||||||
|
die("glob() failed");
|
||||||
|
} else {
|
||||||
|
head = globbuf.gl_pathv[0];
|
||||||
|
result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1);
|
||||||
|
strncpy(result, head, strlen(head));
|
||||||
|
strncat(result, tail, strlen(tail));
|
||||||
|
}
|
||||||
|
globfree(&globbuf);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Checks if the given path exists by calling stat().
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
bool path_exists(const char *path) {
|
||||||
|
struct stat buf;
|
||||||
|
return (stat(path, &buf) == 0);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Goes through the list of arguments (for exec()) and checks if the given argument
|
* Goes through the list of arguments (for exec()) and checks if the given argument
|
||||||
* is present. If not, it copies the arguments (because we cannot realloc it) and
|
* is present. If not, it copies the arguments (because we cannot realloc it) and
|
||||||
|
|
Loading…
Reference in New Issue