Adding scanner title

diff --git a/app/scanner.c b/app/scanner.c
index 1194a42a35f77729ee8c4e1d650ca51d8528efba..33e498fb130a967e02c62deb242b2f06751a136d 100644 (file)
--- a/app/scanner.c
+++ b/app/scanner.c
@@ -212,7 +212,7 @@ static void doscanning(int frequency)
 {
 #define OPEP    "scanner.c:doscanning,"
 
-unsigned int cycle;
+unsigned long cycle;
 SCATYP scanref;
 char **dnsbls;
 char **rmtip;
@@ -235,6 +235,8 @@ while (proceed==true) {
     case 0      :       //empty phase
       break;
     case 1      :       //check about signal
+      cycle++;
+      (void) prc_settitle("%s sleeping mode (cycle=%08d)",appname,cycle);
       (void) sleep(delay);
       break;
     case 2      :       //double check signal
@@ -244,11 +246,9 @@ while (proceed==true) {
         }
       break;
     case 3      :       //refreshing the dnsbls list
-      cycle++;
       if ((cycle%100)==0) {
         dnsbls=(char **)rou_freelist((void **)dnsbls,(genfree_t)rou_freestr);
         dnsbls=load_dnsbls();
-        cycle=0;
         }
       proceed=(dnsbls!=(char **)0);
       break;
@@ -339,6 +339,7 @@ while (proceed==true) {
         }
       break;
     case 1      :       //Preparing scan
+      (void) prc_preptitle(argc,argv,environ);
       (void) rou_setappname(SCANNER);
       (void) rou_modesubrou(true);
       (void) prc_chgid(argv[0]);
@@ -356,6 +357,7 @@ while (proceed==true) {
       (void) doscanning(FREQUENCY);
       break;
     default     :       //end of task
+      (void) prc_cleantitle();
       params=par_freeparams(params);
       (void) rou_loadconfig(config,false);
       (void) sig_trapsignal(false,sig_alrm);

diff --git a/mailleur.spec.in b/mailleur.spec.in
index f62f9c29d17af86eb5f5ba9e0ab7b6257dea66e0..ce7cf595003ee49a349f5794a1c1896c6a70d36a 100644 (file)
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -202,7 +202,6 @@ case "$OS" in
 
 #adjusting libexec bin directory
 %{__ln_s} -nsf  ./bin-posql %{_libexecdir}/%{name}/bin
-echo %{__ln_s}  -nsf ./bin-posql %{_libexecdir}/%{name}/bin
 
 %postun                        postgresql
 if [ "$1" = 0 ]; then
@@ -271,8 +270,7 @@ case "$OS" in
   esac
 
 #adjusting libexec bin directory
-%{__ln}  -nsf ./bin-mysql %{_libexecdir}/%{name}/bin
-echo %{__ln}  -nsf ./bin-mysql %{_libexecdir}/%{name}/bin
+%{__ln_s}  -nsf ./bin-mysql %{_libexecdir}/%{name}/bin
 
 %postun                        mysql
 if [ "$1" = 0 ]; then