MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 06:33:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

ie->len is 0 for events reported on the watch subject

Browse Source 
ie->len is non-0 only when the event is being reported for a file or
directory inside a watched directory.
This commit is contained in:
Julien BLACHE 2009-06-09 13:34:53 +02:00
parent c8cc6bd603
commit cbab1f80e0
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/filescanner.c
View File

@ -779,6 +779,7 @@ inotify_cb(int fd, short event, void *arg)
avl_node_t *node; avl_node_t *node;
char path[PATH_MAX]; char path[PATH_MAX];
int qsize; int qsize;
int namelen;
int ret; int ret;
/* Determine the size of the inotify queue */ /* Determine the size of the inotify queue */
@ -817,14 +818,6 @@ inotify_cb(int fd, short event, void *arg)
* the memory space for ie[1+] contains the name of the file * the memory space for ie[1+] contains the name of the file
* see the inotify documentation * see the inotify documentation
*/ */
if ((ie->len == 0) || (ie->name == NULL))
{
DPRINTF(E_DBG, L_SCAN, "inotify event with no name\n");
continue;
}
wdsearch.wd = ie->wd; wdsearch.wd = ie->wd;
node = avl_search(wd2path, &wdsearch); node = avl_search(wd2path, &wdsearch);
if (!node) if (!node)
@ -836,15 +829,34 @@ inotify_cb(int fd, short event, void *arg)
w2p = (struct wdpath *)node->item; w2p = (struct wdpath *)node->item;
ret = snprintf(path, PATH_MAX, "%s/%s", w2p->path, ie->name); path[0] = '\0';
if ((ret < 0) || (ret >= sizeof(path)))
ret = snprintf(path, PATH_MAX, "%s", w2p->path);
if ((ret < 0) || (ret >= PATH_MAX))
{ {
DPRINTF(E_LOG, L_SCAN, "Skipping %s/%s, PATH_MAX exceeded\n", w2p->path, ie->name); DPRINTF(E_LOG, L_SCAN, "Skipping event under %s, PATH_MAX exceeded\n", w2p->path);
continue; continue;
} }
if (ie->mask & IN_ISDIR) if (ie->len > 0)
{
namelen = PATH_MAX - ret;
ret = snprintf(path + ret, namelen, "/%s", ie->name);
if ((ret < 0) || (ret >= namelen))
{
DPRINTF(E_LOG, L_SCAN, "Skipping %s/%s, PATH_MAX exceeded\n", w2p->path, ie->name);
continue;
}
}
/* ie->len == 0 catches events on the subject of the watch itself.
* As we only watch directories, this catches directories.
* General watch events like IN_UNMOUNT and IN_IGNORED do not come
* with the IN_ISDIR flag set.
*/
if ((ie->mask & IN_ISDIR) || (ie->len == 0))
process_inotify_dir(path, w2p, ie); process_inotify_dir(path, w2p, ie);
else else
process_inotify_file(path, w2p, ie); process_inotify_file(path, w2p, ie);