X-Git-Url: https://gapil.gnulinux.it/gitweb/?p=gapil.git;a=blobdiff_plain;f=sources%2FDirMonitor.c;h=e4c3dc538fd9649c6b79b5b214ab24c0a87c2faa;hp=7e6b2884ee7866b3e666c702420266e4f1337c16;hb=eefeeaee57a56cfe1ff8c02a26c44d6f87f1368c;hpb=b8248eaf35d824e8816c76ad9f9561c76d67b915

diff --git a/sources/DirMonitor.c b/sources/DirMonitor.c
index 7e6b288..e4c3dc5 100644
--- a/sources/DirMonitor.c
+++ b/sources/DirMonitor.c
@@ -25,7 +25,7 @@
  *
  * Author: S. Piccardi Jan. 2003
  *
- * $Id: DirMonitor.c,v 1.2 2003/01/04 17:24:30 piccardi Exp $
+ * $Id: DirMonitor.c,v 1.8 2003/05/02 09:55:13 piccardi Exp $
  *
  *****************************************************************************/
 #include <sys/types.h>
@@ -54,15 +54,13 @@ struct DirProp {
     int tot_block;   
     int tot_char;    
     int tot_sock;
-};
-struct DirProp *shmptr;
-int shmid; 
+} *shmptr;
+key_t key;
 int mutex;
 
 int main(int argc, char *argv[]) 
 {
     int i, pause = 10;
-    key_t key;
     /*
      * Input section: decode command line parameters 
      * Use getopt function
@@ -99,24 +97,25 @@ int main(int argc, char *argv[])
 	printf("Wrong number of arguments %d\n", argc - optind);
         usage();
     }
+    if (chdir(argv[1])) {                      /* chdir to be sure dir exist */
+	perror("Cannot find directory to monitor");
+	exit(1);
+    }
     Signal(SIGTERM, HandSIGTERM);            /* set handlers for termination */
     Signal(SIGINT, HandSIGTERM);
     Signal(SIGQUIT, HandSIGTERM);
-    /* create needed IPC objects */
-    key = ftok("./DirMonitor.c", 1);                         /* define a key */
-    shmid = shmget(key, 4096, IPC_CREAT|0666);        /* get a shared memory */
-    if (shmid < 0) {
+    key = ftok("~/gapil/sources/DirMonitor.c", 1);  /* define a key, use dir */
+    shmptr = ShmCreate(key, 4096, 0666, 0);   /* get a shared memory segment */
+    if (!shmptr) {
 	perror("Cannot create shared memory");
 	exit(1);
     }
-    if ( (shmptr = shmat(shmid, NULL, 0)) == NULL ) {   /* attach to process */
-	perror("Cannot attach segment");
-    }
     if ((mutex = MutexCreate(key)) == -1) {                   /* get a Mutex */
 	perror("Cannot create mutex");
 	exit(1);
     }
     /* main loop, monitor directory properties each 10 sec */
+    daemon(1, 0);              /* demonize process, staying in monitored dir */
     while (1) {
 	MutexLock(mutex);                              /* lock shared memory */
 	memset(shmptr, 0, sizeof(struct DirProp));    /* erase previous data */
@@ -126,7 +125,7 @@ int main(int argc, char *argv[])
     }
 }
 /*
- * Routine to print file name and size inside DirScan
+ * Routine to compute directory properties inside DirScan
  */
 int ComputeValues(struct dirent * direntry) 
 {
@@ -137,10 +136,10 @@ int ComputeValues(struct dirent * direntry)
     if (S_ISREG(data.st_mode)) shmptr->tot_regular++;
     if (S_ISFIFO(data.st_mode)) shmptr->tot_fifo++;
     if (S_ISLNK(data.st_mode)) shmptr->tot_link++;
-    if (S_ISDIR(data.st_mode)) shmptr->tot_dir;
-    if (S_ISBLK(data.st_mode)) shmptr->tot_block;
-    if (S_ISCHR(data.st_mode)) shmptr->tot_char;
-    if (S_ISSOCK(data.st_mode)) shmptr->tot_sock;
+    if (S_ISDIR(data.st_mode)) shmptr->tot_dir++;
+    if (S_ISBLK(data.st_mode)) shmptr->tot_block++;
+    if (S_ISCHR(data.st_mode)) shmptr->tot_char++;
+    if (S_ISSOCK(data.st_mode)) shmptr->tot_sock++;
     return 0;
 }
 /*
@@ -160,14 +159,7 @@ void usage(void) {
 void HandSIGTERM(int signo) {
     MutexLock(mutex);
     debug("Terminated by %s\n", strsignal(signo));
-    if (shmdt(shmptr)) {
-	perror("Error detaching shared memory");
-	exit(1);
-    }
-    if (shmctl(shmid, IPC_RMID, NULL)) {
-	perror("Cannot remove shared memory segment");
-	exit(1);
-    }
+    ShmRemove(key, shmptr);
     MutexRemove(mutex);
     exit(0);
 }