dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

formatting 

SVN revision: 49840
This commit is contained in:
Sebastian Dransfeld 2010-06-25 01:44:30 +00:00
parent 51c6fc3785
commit bcb8744bc0
2 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/efreet/src/lib/efreet_mime.c
View File

@ -738,7 +738,7 @@ efreet_mime_special_check(const char *file)
#ifndef _WIN32 #ifndef _WIN32
if (S_ISLNK(s.st_mode)) if (S_ISLNK(s.st_mode))
return _mime_inode_symlink; return _mime_inode_symlink;
#endif #endif
if (S_ISFIFO(s.st_mode)) if (S_ISFIFO(s.st_mode))

190
legacy/efreet/src/lib/efreet_trash.c
View File

@ -84,84 +84,84 @@ efreet_trash_dir_get(const char *file)
if (file) if (file)
{ {
if (stat(efreet_data_home_get(), &s_dest) != 0) if (stat(efreet_data_home_get(), &s_dest) != 0)
return NULL; return NULL;
if (stat(file, &s_src) != 0) if (stat(file, &s_src) != 0)
return NULL; return NULL;
} }
if (!file || s_src.st_dev == s_dest.st_dev) if (!file || s_src.st_dev == s_dest.st_dev)
{ {
if (efreet_trash_dir && ecore_file_exists(efreet_trash_dir)) if (efreet_trash_dir && ecore_file_exists(efreet_trash_dir))
{ {
eina_stringshare_ref(efreet_trash_dir); eina_stringshare_ref(efreet_trash_dir);
return efreet_trash_dir; return efreet_trash_dir;
} }
snprintf(buf, sizeof(buf), "%s/Trash", efreet_data_home_get()); snprintf(buf, sizeof(buf), "%s/Trash", efreet_data_home_get());
if (!ecore_file_exists(buf) && !ecore_file_mkpath(buf)) if (!ecore_file_exists(buf) && !ecore_file_mkpath(buf))
return NULL; return NULL;
IF_RELEASE(efreet_trash_dir); IF_RELEASE(efreet_trash_dir);
efreet_trash_dir = eina_stringshare_add(buf); efreet_trash_dir = eina_stringshare_add(buf);
trash_dir = eina_stringshare_ref(efreet_trash_dir); trash_dir = eina_stringshare_ref(efreet_trash_dir);
} }
else else
{ {
char *dir; char *dir;
char path[PATH_MAX]; char path[PATH_MAX];
strncpy(buf, file, PATH_MAX); strncpy(buf, file, PATH_MAX);
buf[PATH_MAX - 1] = 0; buf[PATH_MAX - 1] = 0;
path[0] = 0; path[0] = 0;
while (strlen(buf) > 1) while (strlen(buf) > 1)
{ {
strncpy(path, buf, PATH_MAX); strncpy(path, buf, PATH_MAX);
dir = dirname(buf); dir = dirname(buf);
if (stat(dir, &s_dest) == 0) if (stat(dir, &s_dest) == 0)
{ {
if (s_src.st_dev == s_dest.st_dev){ if (s_src.st_dev == s_dest.st_dev){
strncpy(buf, dir, PATH_MAX); strncpy(buf, dir, PATH_MAX);
continue; continue;
} }
else else
{ {
/* other device */ /* other device */
break; break;
} }
} }
path[0] = 0; path[0] = 0;
break; break;
} }
if (path[0]) if (path[0])
{ {
snprintf(buf, sizeof(buf), "%s/.Trash-%d", path, getuid()); snprintf(buf, sizeof(buf), "%s/.Trash-%d", path, getuid());
if (!ecore_file_exists(buf) && !ecore_file_mkpath(buf)) if (!ecore_file_exists(buf) && !ecore_file_mkpath(buf))
return NULL; return NULL;
trash_dir = eina_stringshare_add(buf); trash_dir = eina_stringshare_add(buf);
} }
} }
if (trash_dir) if (trash_dir)
{ {
snprintf(buf, sizeof(buf), "%s/files", trash_dir); snprintf(buf, sizeof(buf), "%s/files", trash_dir);
if (!ecore_file_exists(buf) && !ecore_file_mkpath(buf)) if (!ecore_file_exists(buf) && !ecore_file_mkpath(buf))
{ {
eina_stringshare_del(trash_dir); eina_stringshare_del(trash_dir);
return NULL; return NULL;
} }
snprintf(buf, sizeof(buf), "%s/info", trash_dir); snprintf(buf, sizeof(buf), "%s/info", trash_dir);
if (!ecore_file_exists(buf) && !ecore_file_mkpath(buf)) if (!ecore_file_exists(buf) && !ecore_file_mkpath(buf))
{ {
eina_stringshare_del(trash_dir); eina_stringshare_del(trash_dir);
return NULL; return NULL;
} }
} }
return trash_dir; return trash_dir;
@ -197,42 +197,42 @@ efreet_trash_delete_uri(Efreet_Uri *uri, int force_delete)
trash_dir = efreet_trash_dir_get(uri->path); trash_dir = efreet_trash_dir_get(uri->path);
if (!trash_dir) if (!trash_dir)
{ {
ERR("EFREET TRASH ERROR: No trash directory."); ERR("EFREET TRASH ERROR: No trash directory.");
return 0; return 0;
} }
snprintf(dest, sizeof(dest), "%s/files/%s", trash_dir, fname); snprintf(dest, sizeof(dest), "%s/files/%s", trash_dir, fname);
/* search for a free filename */ /* search for a free filename */
while (ecore_file_exists(dest) && (i < 100)) while (ecore_file_exists(dest) && (i < 100))
snprintf(dest, sizeof(dest), "%s/files/%s$%d", snprintf(dest, sizeof(dest), "%s/files/%s$%d",
trash_dir, fname, i++); trash_dir, fname, i++);
fname = ecore_file_file_get(dest); fname = ecore_file_file_get(dest);
/* move file to trash dir */ /* move file to trash dir */
if (rename(uri->path, dest)) if (rename(uri->path, dest))
{ {
if (errno == EXDEV) if (errno == EXDEV)
{ {
if (!force_delete) if (!force_delete)
{ {
eina_stringshare_del(trash_dir); eina_stringshare_del(trash_dir);
return -1; return -1;
} }
if (!ecore_file_recursive_rm(uri->path)) if (!ecore_file_recursive_rm(uri->path))
{ {
ERR("EFREET TRASH ERROR: Can't delete file."); ERR("EFREET TRASH ERROR: Can't delete file.");
eina_stringshare_del(trash_dir); eina_stringshare_del(trash_dir);
return 0; return 0;
} }
} }
else else
{ {
ERR("EFREET TRASH ERROR: Can't move file to trash."); ERR("EFREET TRASH ERROR: Can't move file to trash.");
eina_stringshare_del(trash_dir); eina_stringshare_del(trash_dir);
return 0; return 0;
} }
} }
/* create info file */ /* create info file */
@ -240,24 +240,24 @@ efreet_trash_delete_uri(Efreet_Uri *uri, int force_delete)
if ((f = fopen(dest, "w"))) if ((f = fopen(dest, "w")))
{ {
fputs("[Trash Info]\n", f); //TODO is '\n' right?? (or \r\c??) fputs("[Trash Info]\n", f); //TODO is '\n' right?? (or \r\c??)
fputs("Path=", f); fputs("Path=", f);
escaped = efreet_uri_encode(uri); escaped = efreet_uri_encode(uri);
fputs(escaped + 7, f); // +7 == don't write 'file://' fputs(escaped + 7, f); // +7 == don't write 'file://'
IF_RELEASE(escaped); IF_RELEASE(escaped);
time(&now); time(&now);
strftime(times, sizeof(times), "%Y-%m-%dT%H:%M:%S", localtime(&now)); strftime(times, sizeof(times), "%Y-%m-%dT%H:%M:%S", localtime(&now));
fputs("\nDeletionDate=", f); fputs("\nDeletionDate=", f);
fputs(times, f); fputs(times, f);
fputs("\n", f); fputs("\n", f);
fclose(f); fclose(f);
} }
else else
{ {
ERR("EFREET TRASH ERROR: Can't create trash info file."); ERR("EFREET TRASH ERROR: Can't create trash info file.");
return 0; return 0;
} }
return 1; return 1;