RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

policycoreutils: make use of the new realpath_not_final function 

Instead of coding the exact same thing and calling it symlink_realpath
use the function exported by libselinux.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Dan Walsh <dwalsh@redhat.com>
This commit is contained in:
Eric Paris 2011-09-23 17:39:43 -04:00
parent 1486820665
commit d5475a909a
1 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
policycoreutils/setfiles/restore.c
View File

@ -250,46 +250,6 @@ static int apply_spec(FTSENT *ftsent)
return rc;
}
static int symlink_realpath(char *name, char *path)
{
char *p = NULL, *file_sep;
char *tmp_path = strdupa(name);
size_t len = 0;
if (!tmp_path) {
fprintf(stderr, "strdupa on %s failed: %s\n", name,
strerror(errno));
return -1;
}
file_sep = strrchr(tmp_path, '/');
if (file_sep == tmp_path) {
file_sep++;
p = strcpy(path, "");
} else if (file_sep) {
*file_sep = 0;
file_sep++;
p = realpath(tmp_path, path);
} else {
file_sep = tmp_path;
p = realpath("./", path);
}
if (p)
len = strlen(p);
if (!p || len + strlen(file_sep) + 2 > PATH_MAX) {
fprintf(stderr, "symlink_realpath(%s) failed %s\n", name,
strerror(errno));
return -1;
}
p += len;
/* ensure trailing slash of directory name */
if (len == 0 || *(p - 1) != '/') {
*p = '/';
p++;
}
strcpy(p, file_sep);
return 0;
}
static int process_one(char *name, int recurse_this_path)
{
int rc = 0;
@ -414,7 +374,7 @@ int process_one_realpath(char *name, int recurse)
if (S_ISLNK(sb.st_mode)) {
char path[PATH_MAX + 1];
rc = symlink_realpath(name, path);
rc = realpath_not_final(name, path);
if (rc < 0)
return rc;
rc = process_one(path, 0);