Merge branch 'master' of login.chiark.greenend.org.uk:public-git/innduct

Conflicts:

	filemon.c

diff --cc filemon.c
index cb054c59d25e573d9dd2464d91b5049093e4103b,7ba11b5f19d62a9b945913e0b9ea6e93c3b8d5f9..df0606b7b8b70900f41df44a9f3897bfa97aaec7
--- 1/filemon.c
--- 2/filemon.c
+++ b/filemon.c
@@@ -48,10 -48,10 +48,10 @@@ static void filemon_method_startfile(In
    pf->ipf= ipf;
  
    pf->wd= inotify_add_watch(filemon_inotify_fd, ipf->path, IN_MODIFY);
 -  if (pf->wd < 0) sysdie("inotify_add_watch %s", ipf->path);
 +  if (pf->wd < 0) sysdie("filemon inotify: inotify_add_watch %s", ipf->path);
  
    LIST_ADDHEAD(filemon_inotify_watches, pf);
-   dbg("filemon inotify: startfile %p wd=%d pf=%p", ipf, wd, pf);
 -  dbg("filemon inotify startfile %p wd=%d pf=%p", ipf, pf->wd, pf);
++  dbg("filemon inotify: startfile %p wd=%d pf=%p", ipf, pf->wd, pf);
  }
  
  static void filemon_method_stopfile(InputFile *ipf, Filemon_Perfile *pf) {