storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix Samba copy errors with inotify enabled.

Browse Source
This commit is contained in:
Justin Maggard 2009-10-23 01:02:40 +00:00
parent e18cf08880
commit 590f0761f4
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
inotify.c
View File

@ -399,10 +399,11 @@ inotify_insert_directory(int fd, char *name, const char * path)
char **result; char **result;
char *id=NULL, *path_buf, *parent_buf, *esc_name; char *id=NULL, *path_buf, *parent_buf, *esc_name;
int wd; int wd;
int rows, i = 0; int rows;
enum file_types type = TYPE_UNKNOWN; enum file_types type = TYPE_UNKNOWN;
enum media_types dir_type = ALL_MEDIA; enum media_types dir_type = ALL_MEDIA;
struct media_dir_s * media_path; struct media_dir_s * media_path;
struct stat st;
parent_buf = dirname(strdup(path)); parent_buf = dirname(strdup(path));
sql = sqlite3_mprintf("SELECT OBJECT_ID from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)" sql = sqlite3_mprintf("SELECT OBJECT_ID from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)"
@ -438,47 +439,47 @@ inotify_insert_directory(int fd, char *name, const char * path)
} }
ds = opendir(path); ds = opendir(path);
if( ds != NULL ) if( !ds )
{ {
while( (e = readdir(ds)) ) DPRINTF(E_ERROR, L_INOTIFY, "opendir failed! [%s]\n", strerror(errno));
return -1;
}
while( (e = readdir(ds)) )
{
if( strcmp(e->d_name, ".") == 0 ||
strcmp(e->d_name, "..") == 0 )
continue;
esc_name = escape_tag(e->d_name);
if( !esc_name )
esc_name = strdup(e->d_name);
asprintf(&path_buf, "%s/%s", path, e->d_name);
switch( e->d_type )
{ {
if( strcmp(e->d_name, ".") == 0 || case DT_DIR:
strcmp(e->d_name, "..") == 0 ) case DT_REG:
continue; case DT_LNK:
esc_name = escape_tag(e->d_name); case DT_UNKNOWN:
if( !esc_name ) type = resolve_unknown_type(path_buf, dir_type);
esc_name = strdup(e->d_name); default:
asprintf(&path_buf, "%s/%s", path, e->d_name); break;
switch( e->d_type ) }
{ if( type == TYPE_DIR )
case DT_DIR: {
case DT_REG: inotify_insert_directory(fd, esc_name, path_buf);
case DT_LNK: }
case DT_UNKNOWN: else if( type == TYPE_FILE )
type = resolve_unknown_type(path_buf, dir_type); {
default: if( (stat(path_buf, &st) == 0) && (st.st_blocks<<9 >= st.st_size) )
break;
}
if( type == TYPE_DIR )
{
inotify_insert_directory(fd, esc_name, path_buf);
}
else if( type == TYPE_FILE )
{ {
inotify_insert_file(esc_name, path_buf); inotify_insert_file(esc_name, path_buf);
} }
free(esc_name);
free(path_buf);
} }
} free(esc_name);
else free(path_buf);
{
DPRINTF(E_ERROR, L_INOTIFY, "opendir failed! [%s]\n", strerror(errno));
} }
closedir(ds); closedir(ds);
i++;
return(i); return 0;
} }
int int