'readdir_r' is deprecated since version 2.24 glibc.
By upgrading TOOLCHAIN for platform, it should be replaced by 'readdir'
Change-Id: I802ccd1cca6d9504948140a9c72000c9960b3ea1
Signed-off-by: Inkyun Kil <inkyun.kil@samsung.com>
int _app2sd_delete_directory(const char *dirname)
{
DIR *dp = NULL;
- struct dirent ep;
- struct dirent *er = NULL;
+ struct dirent *ep = NULL;
char abs_filename[FILENAME_MAX] = { 0, };
int ret = 0;
dp = opendir(dirname);
if (dp != NULL) {
- while (readdir_r(dp, &ep, &er) == 0 && er != NULL) {
+ while ((ep = readdir(dp)) != NULL) {
struct stat stFileInfo;
snprintf(abs_filename, FILENAME_MAX, "%s/%s", dirname,
- ep.d_name);
+ ep->d_name);
if (lstat(abs_filename, &stFileInfo) < 0) {
perror(abs_filename);
}
if (S_ISDIR(stFileInfo.st_mode)) {
- if (strcmp(ep.d_name, ".")
- && strcmp(ep.d_name, "..")) {
+ if (strcmp(ep->d_name, ".")
+ && strcmp(ep->d_name, "..")) {
ret = _app2sd_delete_directory(abs_filename);
if (ret < 0) {
(void)closedir(dp);
int app2sd_enable_full_pkg(void)
{
int ret = APP2EXT_SUCCESS;
- int rc = 0;
char buf[FILENAME_MAX] = { 0, };
char app2sd_path[FILENAME_MAX] = { 0, };
char loopback_device[FILENAME_MAX] = { 0, };
char *sdpath = NULL;
char *pkgid = NULL;
DIR *dir = NULL;
- struct dirent entry;
- struct dirent *result = NULL;
+ struct dirent *entry = NULL;
uid_t uid = 0;
/* check whether MMC is present or not */
return APP2EXT_ERROR_SQLITE_REGISTRY;
}
- for (rc = readdir_r(dir, &entry, &result);
- rc == 0 && result != NULL;
- rc = readdir_r(dir, &entry, &result)) {
- if (strcmp(entry.d_name, ".") == 0 ||
- strcmp(entry.d_name, "..") == 0)
+ while ((entry = readdir(dir)) != NULL) {
+ if (strcmp(entry->d_name, ".") == 0 ||
+ strcmp(entry->d_name, "..") == 0)
continue;
snprintf(loopback_device, FILENAME_MAX - 1, "%s/%s",
- app2sd_path, entry.d_name);
+ app2sd_path, entry->d_name);
ret = _app2sd_get_info_from_db(loopback_device,
&pkgid, &uid);
if (ret) {
{
int ret = 0;
DIR *dp = NULL;
- struct dirent ep;
- struct dirent *er = NULL;
+ struct dirent *ep = NULL;
char abs_filename[FILENAME_MAX] = { 0, };
dp = opendir(dirname);
if (dp != NULL) {
- while (readdir_r(dp, &ep, &er) == 0 && er != NULL) {
+ while ((ep = readdir(dp)) != NULL) {
char mmc_path[PATH_MAX] = {0};
- if (!strcmp(ep.d_name, ".") || !strcmp(ep.d_name, ".."))
+ if (!strcmp(ep->d_name, ".") || !strcmp(ep->d_name, ".."))
continue;
/*get realpath find symlink to ".mmc" and unlink it*/
- snprintf(abs_filename, FILENAME_MAX, "%s/%s", dirname, ep.d_name);
+ snprintf(abs_filename, FILENAME_MAX, "%s/%s", dirname, ep->d_name);
char *path = realpath(abs_filename, mmc_path);
if (!path)
_E("realpath failed");
{
static unsigned long long total = 0;
DIR *dp = NULL;
- struct dirent ep;
- struct dirent *er = NULL;
+ struct dirent *ep = NULL;
char abs_filename[FILENAME_MAX] = { 0, };;
dp = opendir(dirname);
if (dp != NULL) {
- while (readdir_r(dp, &ep, &er) == 0 && er != NULL) {
+ while ((ep = readdir(dp)) != NULL) {
struct stat stFileInfo;
snprintf(abs_filename, FILENAME_MAX, "%s/%s", dirname,
- ep.d_name);
+ ep->d_name);
if (stat(abs_filename, &stFileInfo) < 0)
perror(abs_filename);
total += stFileInfo.st_size;
if (S_ISDIR(stFileInfo.st_mode)) {
- if (strcmp(ep.d_name, ".")
- && strcmp(ep.d_name, "..")) {
+ if (strcmp(ep->d_name, ".")
+ && strcmp(ep->d_name, "..")) {
_app2sd_calculate_dir_size
(abs_filename);
}