Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-28 13:00:45 +00:00
Code Issues Releases Activity

Set CLOEXEC flag on the inotify file descriptor

Browse Source
This commit is contained in:
Pavel Labath 2010-09-12 16:36:21 +02:00
parent eeb1a6a0d7
commit 0fd23a6f7e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/conky.cc
View File

@ -3291,8 +3291,6 @@ int main(int argc, char **argv)
std::cerr << "caught exception: " << e.what() << std::endl; std::cerr << "caught exception: " << e.what() << std::endl;
} }
#endif #endif
return 0;
//////////// XXX ////////////////////////////////
#ifdef BUILD_WEATHER_XOAP #ifdef BUILD_WEATHER_XOAP
/* Load xoap keys, if existing */ /* Load xoap keys, if existing */
@ -3300,14 +3298,16 @@ int main(int argc, char **argv)
#endif /* BUILD_WEATHER_XOAP */ #endif /* BUILD_WEATHER_XOAP */
#ifdef HAVE_SYS_INOTIFY_H #ifdef HAVE_SYS_INOTIFY_H
// the file descriptor will be automatically closed on exit
inotify_fd = inotify_init(); inotify_fd = inotify_init();
if(inotify_fd != -1) { if(inotify_fd != -1) {
int fl; fcntl(inotify_fd, F_SETFL, fcntl(inotify_fd, F_GETFL) | O_NONBLOCK);
fl = fcntl(inotify_fd, F_GETFL); fcntl(inotify_fd, F_SETFD, fcntl(inotify_fd, F_GETFD) | FD_CLOEXEC);
fcntl(inotify_fd, F_SETFL, fl | O_NONBLOCK);
} }
#endif /* HAVE_SYS_INOTIFY_H */ #endif /* HAVE_SYS_INOTIFY_H */
return 0;
//////////// XXX ////////////////////////////////
initialisation(argc, argv); initialisation(argc, argv);