* Author: S. Piccardi Jul. 2007
*
*****************************************************************************/
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <sys/types.h> /* primitive system data types */
+#include <sys/stat.h> /* file characteristics constants and functions */
#include <sys/inotify.h> /* Linux inotify interface */
-#include <sys/epoll.h> /* Linux epoll interface */
#include <stdlib.h> /* C standard library */
-#include <unistd.h> /* Unix standard library */
+#include <unistd.h> /* unix standard library */
#include <errno.h> /* error definitions and routines */
#include <stdio.h> /* standard I/O library */
-#include <string.h> /* string functions */
-#include <fcntl.h> /* fcntl function */
-#include <sys/ioctl.h> /* ioctl function */
+#include <string.h> /* C strings library */
+#include <fcntl.h> /* file control functions */
+#include <sys/ioctl.h> /* ioctl syscall and constants */
#include "macros.h"
int main(int argc, char *argv[])
{
- int i, size, nread;
- int fd, wd, epfd;
- char buffer[1024 + sizeof(struct inotify_event)];
+ int i, narg, nread;
+ int fd, wd;
+ char buffer[512 * (sizeof(struct inotify_event) + 16)];
unsigned int mask=0;
struct inotify_event * event;
- struct epoll_event epev;
/*
* Input section: decode command line parameters
* Use getopt function
*/
opterr = 0; /* don't want writing to stderr */
- while ((i = getopt(argc, argv, "hrwcda")) != -1) {
+ while ((i = getopt(argc, argv, "hrwcdaCM")) != -1) {
switch (i) {
/*
* Handling options
case 'a': /* all events */
mask |= IN_ALL_EVENTS;
break;
+ case 'C': /* creation */
+ mask |= IN_CLOSE;
+ break;
+ case 'M': /* creation */
+ mask |= IN_MOVE;
+ break;
case '?': /* unrecognized options */
printf("Unrecognized options -%c\n",optopt);
usage();
usage();
}
}
+ if (mask == 0) {
+ printf("No events to monitor\n");
+ usage();
+ }
/* ***********************************************************
*
* Options processing completed
* Main code beginning
*
* ***********************************************************/
- if ((argc - optind) != 1) { /* There must be one argument */
+ narg = argc - optind;
+ if (narg < 1) { /* There must be at least one argument */
printf("Wrong number of arguments %d\n", argc - optind);
usage();
}
- epfd = epoll_create(5); /* initialize epoll */
- if (epfd < 0) {
- perror("Failing on epoll_create");
- exit(-1);
- }
- fd = inotify_init(); /* initialize inotify */
+ fd = inotify_init(); /* initialize inotify */
if (fd < 0) {
- perror("Failing on inotify_init");
+ perror("Failing on inotify_init");
exit(-1);
}
- if (fcntl(fd, F_SETFL, O_NONBLOCK)) { /* no blocking I/O on inotify */
- perror("Cannot set noblocking I/O on inotify fd");
- exit(-1);
- }
- wd = inotify_add_watch(fd, argv[optind], mask); /* add watch */
- if (wd <= 0) {
- printf("Failing to add watched file %s, mask %i; %s\n",
- argv[optind], mask, strerror(errno));
- exit(-1);
- }
- epev.data.fd = fd; /* add inotify fd to epoll */
- epev.events = EPOLLIN;
- if (epoll_ctl(epfd, EPOLL_CTL_ADD, fd, &epev)) {
- perror("Failing on epoll_ctl");
- exit(-1);
+ i = 0;
+ while (i < narg) {
+ wd = inotify_add_watch(fd, argv[optind+i], mask); /* add watch */
+ if (wd <= 0) {
+ printf("Failing to add watched file %s, mask %i; %s\n",
+ argv[optind+i], mask, strerror(errno));
+ exit(-1);
+ }
+ i++;
}
/*
* Main Loop: read events and print them
*/
while (1) {
- if (epoll_wait(epfd, &epev, 1, -1) < 0) {
- perror("error on epoll_wait");
- exit(-1);
- }
- if (epev.data.fd != fd)
- printf("something wrong, epoll activity on %i instead of %i\n",
- epev.data.fd, fd);
-
- if (ioctl(fd, FIONREAD, &size)) {
- perror("error on getting inotify event size");
- exit(-1);
- }
- if (size > sizeof(buffer)) {
- printf("Too many %i data to read, something wrong\n", size);
- exit(-1);
- }
- i = 0;
- while (i < size) {
- nread = read(fd, buffer, size);
- if (nread < 0) {
+ nread = read(fd, buffer, sizeof(buffer));
+ if (nread < 0) {
+ if (errno == EINTR) {
+ continue;
+ } else {
perror("error reading inotify data");
exit(1);
}
- i += nread;
- event = (struct inotify_event *) buffer;
- if (wd != event->wd) {
- printf("Getting different watch descriptor, %i and %i\n",
- wd, event->wd);
- } else {
+ } else {
+ i = 0;
+ while (i < nread) {
+ event = (struct inotify_event *) buffer + i;
+ printf("Watch descriptor %i\n", event->wd);
printf("Observed event on %s\n", argv[optind-1+event->wd]);
- if (event->name != NULL)
+ if (event->len) {
printf("On file %s\n", event->name);
+ }
printevent(event->mask);
+ i += sizeof(struct inotify_event) + event->len;
}
}
}
void usage(void) {
printf("Program inotify_monitor: monitor file changes \n");
printf("Usage:\n");
- printf(" inotify_monitor [-h] -rwcd dirname/filename dir/file ... \n");
+ printf(" inotify_monitor [-h] -rwcdCMa dirname/filename dir/file ... \n");
printf(" -h print this help\n");
printf(" -w watch write\n");
printf(" -r watch read\n");
printf(" -c watch create\n");
printf(" -d watch delete\n");
+ printf(" -C watch closing\n");
+ printf(" -M watch moving\n");
printf(" -a watch all\n");
exit(1);
}
projects / gapil.git / blobdiff