From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Tue, 1 Jun 2010 20:25:43 +0000 (+0100)
Subject: Merge branch 'master' of login.chiark.greenend.org.uk:public-git/innduct
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=fdffbf24083becad90bf829ee03b9f87dbcd9142;p=innduct.git

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

Conflicts:

	filemon.c
---

fdffbf24083becad90bf829ee03b9f87dbcd9142
diff --cc filemon.c
index cb054c5,7ba11b5..df0606b
--- a/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) {