X-Git-Url: https://gapil.gnulinux.it/gitweb/?p=gapil.git;a=blobdiff_plain;f=sources%2Finotify_monitor.c;h=60fa1035f8d5e4b2af625e92277c4648e3ecd8a1;hp=92391cf39b5133c8ab49435f6c76a1878f0f8dee;hb=26f7a8bb19c6cb198c213757a97b6ac79e40db4b;hpb=e62b1d15cd14bfe362613091cad4d621c7ffc904

diff --git a/sources/inotify_monitor.c b/sources/inotify_monitor.c
index 92391cf..60fa103 100644
--- a/sources/inotify_monitor.c
+++ b/sources/inotify_monitor.c
@@ -18,21 +18,24 @@
  */
 /*****************************************************************************
  *
- * File inotufy_monitor.c: 
+ * File inotify_monitor.c: 
  *
- * An example for shared memory use: monitor a directory status,
- * saving data in a shared memory segment
+ * An example of the inotify interface: use inotify to watch the
+ * status of a directory or a file
  *
  * Author: S. Piccardi Jul. 2007
  *
  *****************************************************************************/
-#include <sys/types.h>
-#include <sys/inotify.h>
-#include <stdlib.h>        /* C standard library */
-#include <unistd.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 <stdlib.h>      /* C 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 <string.h>      /* C strings library */
+#include <fcntl.h>       /* file control functions */
+#include <sys/ioctl.h>   /* ioctl syscall and constants */
 
 
 #include "macros.h"
@@ -43,9 +46,9 @@ void printevent(unsigned int mask);
 
 int main(int argc, char *argv[]) 
 {
-    int i, size;
+    int i, narg, nread;
     int fd, wd;
-    char buffer[128*sizeof(struct inotify_event)];
+    char buffer[512 * (sizeof(struct inotify_event) + 16)];
     unsigned int mask=0;
     struct inotify_event * event;
     /*
@@ -53,7 +56,7 @@ int main(int argc, char *argv[])
      * 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 
@@ -76,6 +79,12 @@ int main(int argc, char *argv[])
 	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();
@@ -83,6 +92,10 @@ int main(int argc, char *argv[])
 	    usage();
 	}
     }
+    if (mask == 0) {
+	printf("No events to monitor\n");
+	usage();
+    }
     /* ***********************************************************
      * 
      *		 Options processing completed
@@ -90,42 +103,53 @@ int main(int argc, char *argv[])
      *		      Main code beginning
      * 
      * ***********************************************************/
-    /* There must be one argument */
-    if ((argc - optind) != 1) {  
+    narg = argc - optind; 
+    if (narg < 1) { /* There must be at least one argument */
 	printf("Wrong number of arguments %d\n", argc - optind);
         usage();
     }
-    /* initalialize inotify */
-    fd = inotify_init ();
-    if (fd < 0)
-        perror("Failing on inotify_init");
-
-    /* add watch */
-    wd = inotify_add_watch(fd, argv[optind], mask);
-    if ( wd <= 0) {
-	printf("Failing to add watched file %s, mask %i; %s\n", 
-	      argv[optind], mask, strerror(errno));
+    fd = inotify_init();       /* initialize inotify */
+    if (fd < 0) {
+	perror("Failing on inotify_init");
 	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) {
-	size = read(fd, buffer, sizeof(buffer));
-	
-	event = (struct inotify_event *) buffer;
-        if (wd != event->wd) {
-	    printf("Error, getting different watch descriptor, %i and %i\n",
-		   wd, event->wd); 
-	    exit(1);
+	nread = read(fd, buffer, sizeof(buffer));
+	if (nread < 0) {
+	    if (errno == EINTR) {
+		continue;
+	    } else {
+		perror("error reading inotify data");
+		exit(1);
+	    }
+	} 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->len) {
+		    printf("On file %s\n", event->name);
+		}
+		printevent(event->mask);
+		i += sizeof(struct inotify_event) + event->len;
+	    }
 	}
-	printf("Observed event on %s\n", argv[optind-1+event->wd]);
-	if (event->name != NULL)
-	    printf("On file %s\n", event->name);
-	printevent(event->mask);
     }
     return 0;
-
 }
 /*
  * routine to print usage info and exit
@@ -133,12 +157,14 @@ int main(int argc, char *argv[])
 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);
 }