summaryrefslogtreecommitdiffstats
path: root/minzip
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-09-11 20:37:10 +0200
committerNick Kralevich <nnk@google.com>2013-09-11 20:37:10 +0200
commit08ef9a957027183dcf55e432441e8fb0d5299aba (patch)
tree8de1908105a0bd46cd66c53235bbbfb746433f5e /minzip
parentam af677d78: am e461251e: Don\'t apply permission changes to symlink. (diff)
downloadandroid_bootable_recovery-08ef9a957027183dcf55e432441e8fb0d5299aba.tar
android_bootable_recovery-08ef9a957027183dcf55e432441e8fb0d5299aba.tar.gz
android_bootable_recovery-08ef9a957027183dcf55e432441e8fb0d5299aba.tar.bz2
android_bootable_recovery-08ef9a957027183dcf55e432441e8fb0d5299aba.tar.lz
android_bootable_recovery-08ef9a957027183dcf55e432441e8fb0d5299aba.tar.xz
android_bootable_recovery-08ef9a957027183dcf55e432441e8fb0d5299aba.tar.zst
android_bootable_recovery-08ef9a957027183dcf55e432441e8fb0d5299aba.zip
Diffstat (limited to 'minzip')
-rw-r--r--minzip/DirUtil.c58
-rw-r--r--minzip/DirUtil.h8
2 files changed, 0 insertions, 66 deletions
diff --git a/minzip/DirUtil.c b/minzip/DirUtil.c
index 8dd5da1da..fe2c880ac 100644
--- a/minzip/DirUtil.c
+++ b/minzip/DirUtil.c
@@ -234,61 +234,3 @@ dirUnlinkHierarchy(const char *path)
/* delete target directory */
return rmdir(path);
}
-
-int
-dirSetHierarchyPermissions(const char *path,
- int uid, int gid, int dirMode, int fileMode)
-{
- struct stat st;
- if (lstat(path, &st)) {
- return -1;
- }
-
- /* ignore symlinks */
- if (S_ISLNK(st.st_mode)) {
- return 0;
- }
-
- /* directories and files get different permissions */
- if (chown(path, uid, gid) ||
- chmod(path, S_ISDIR(st.st_mode) ? dirMode : fileMode)) {
- return -1;
- }
-
- /* recurse over directory components */
- if (S_ISDIR(st.st_mode)) {
- DIR *dir = opendir(path);
- if (dir == NULL) {
- return -1;
- }
-
- errno = 0;
- const struct dirent *de;
- while (errno == 0 && (de = readdir(dir)) != NULL) {
- if (!strcmp(de->d_name, "..") || !strcmp(de->d_name, ".")) {
- continue;
- }
-
- char dn[PATH_MAX];
- snprintf(dn, sizeof(dn), "%s/%s", path, de->d_name);
- if (!dirSetHierarchyPermissions(dn, uid, gid, dirMode, fileMode)) {
- errno = 0;
- } else if (errno == 0) {
- errno = -1;
- }
- }
-
- if (errno != 0) {
- int save = errno;
- closedir(dir);
- errno = save;
- return -1;
- }
-
- if (closedir(dir)) {
- return -1;
- }
- }
-
- return 0;
-}
diff --git a/minzip/DirUtil.h b/minzip/DirUtil.h
index a5cfa761b..85a00128b 100644
--- a/minzip/DirUtil.h
+++ b/minzip/DirUtil.h
@@ -48,14 +48,6 @@ int dirCreateHierarchy(const char *path, int mode,
*/
int dirUnlinkHierarchy(const char *path);
-/* chown -R <uid>:<gid> <path>
- * chmod -R <mode> <path>
- *
- * Sets directories to <dirMode> and files to <fileMode>. Skips symlinks.
- */
-int dirSetHierarchyPermissions(const char *path,
- int uid, int gid, int dirMode, int fileMode);
-
#ifdef __cplusplus
}
#endif