mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3027 from madblobfish/remove-resolve_path 

Remove resolve_path() from utils
This commit is contained in:
emersion 2018-10-31 14:48:17 +01:00 committed by GitHub
parent fbbf810668 1f23ec2d05
commit e9c136b0ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
common/util.c
View File

@ -138,40 +138,3 @@ bool parse_boolean(const char *boolean, bool current) {
// All other values are false to match i3
return false;
}
char* resolve_path(const char* path) {
struct stat sb;
ssize_t r;
int i;
char *current = NULL;
char *resolved = NULL;
if(!(current = strdup(path))) {
return NULL;
}
for (i = 0; i < 16; ++i) {
if (lstat(current, &sb) == -1) {
goto failed;
}
if((sb.st_mode & S_IFMT) != S_IFLNK) {
return current;
}
if (!(resolved = malloc(sb.st_size + 1))) {
goto failed;
}
r = readlink(current, resolved, sb.st_size);
if (r == -1 || r > sb.st_size) {
goto failed;
}
resolved[r] = '\0';
free(current);
current = strdup(resolved);
free(resolved);
resolved = NULL;
}
failed:
free(resolved);
free(current);
return NULL;
}

9
include/util.h
View File

@ -59,13 +59,4 @@ uint32_t parse_color(const char *color);
*/
bool parse_boolean(const char *boolean, bool current);
/**
* Given a path string, recurseively resolves any symlinks to their targets
* (which may be a file, directory) and returns the result.
* argument is returned. Caller must free the returned buffer.
* If an error occures, if the path does not exist or if the path corresponds
* to a dangling symlink, NULL is returned.
*/
char* resolve_path(const char* path);
#endif