--- installwatch.c	2006-02-20 18:25:25.000000000 +0100
+++ installwatch.c.new	2006-02-20 19:19:46.000000000 +0100
@@ -251,7 +251,7 @@
 ;
 */
 
-static inline int log(const char *format,...)
+static inline int logg(const char *format,...)
 #ifdef __GNUC__
 	/* Tell gcc that this function behaves like printf()
 	 * for parameters 1 and 2                            */
@@ -412,12 +412,12 @@
 }
 */
 
-static inline int log(const char *format,...) {
+static inline int logg(const char *format,...) {
 	char *logname;
 	va_list ap;
 	int rcod; 
 	
-	logname=getenv("INSTW_LOGFILE");
+	logname=getenv("INSTALLWATCHFILE");
 	va_start(ap,format);
 	rcod=vlambda_log(logname,format,ap);
 	va_end(ap);
@@ -2130,7 +2130,7 @@
 	instw_apply(&instw);
 
 	result = true_chmod(instw.translpath, mode);
-	log("%d\tchmod\t%s\t0%04o\t#%s\n",result,
+	logg("%d\tchmod\t%s\t0%04o\t#%s\n",result,
 	    instw.reslvpath,mode,error(result));
 
 	instw_delete(&instw);
@@ -2169,7 +2169,7 @@
 	instw_apply(&instw);
 
 	result=true_chown(instw.translpath,owner,group);
-	log("%d\tchown\t%s\t%d\t%d\t#%s\n",result,
+	logg("%d\tchown\t%s\t%d\t%d\t#%s\n",result,
 	    instw.reslvpath,owner,group,error(result));
 
 	instw_delete(&instw);
@@ -2196,7 +2196,7 @@
 	   * From now on, another log file will be written if 
 	   * INSTW_LOGFILE is set                          
 	   */
-	log("%d\tchroot\t%s\t#%s\n", result, canonic, error(result));
+	logg("%d\tchroot\t%s\t#%s\n", result, canonic, error(result));
 	return result;
 }
 
@@ -2232,7 +2232,7 @@
 	instw_apply(&instw);
 
 	result = true_open(instw.translpath,O_CREAT|O_WRONLY|O_TRUNC,mode);
-	log("%d\tcreat\t%s\t#%s\n",result,instw.reslvpath,error(result));
+	logg("%d\tcreat\t%s\t#%s\n",result,instw.reslvpath,error(result));
 
 	instw_delete(&instw);
 
@@ -2252,7 +2252,7 @@
 #endif
 
 	result = true_fchmod(filedes, mode);
-	log("%d\tfchmod\t%d\t0%04o\t#%s\n",result,filedes,mode,error(result));
+	logg("%d\tfchmod\t%d\t0%04o\t#%s\n",result,filedes,mode,error(result));
 	return result;
 }
 
@@ -2269,7 +2269,7 @@
 #endif
 
 	result = true_fchown(fd, owner, group);
-	log("%d\tfchown\t%d\t%d\t%d\t#%s\n",result,fd,owner,group,error(result));
+	logg("%d\tfchown\t%d\t%d\t%d\t#%s\n",result,fd,owner,group,error(result));
 	return result;
 }
 
@@ -2304,7 +2304,7 @@
 	if(mode[0]=='w'||mode[0]=='a'||mode[1]=='+') {
 		backup(instw.truepath);
 		instw_apply(&instw);
-		log("%d\tfopen\t%s\t#%s\n",(int)result,
+		logg("%d\tfopen\t%s\t#%s\n",(int)result,
 		    instw.reslvpath,error(result));
 	}
 
@@ -2319,7 +2319,7 @@
 	}
 	
 	if(mode[0]=='w'||mode[0]=='a'||mode[1]=='+') 
-		log("%d\tfopen\t%s\t#%s\n",(int)result,
+		logg("%d\tfopen\t%s\t#%s\n",(int)result,
 		    instw.reslvpath,error(result));
 
 	instw_delete(&instw);
@@ -2340,7 +2340,7 @@
 #endif
 
 	result = true_ftruncate(fd, length);
-	log("%d\tftruncate\t%d\t%d\t#%s\n",result,fd,(int)length,error(result));
+	logg("%d\tftruncate\t%d\t%d\t#%s\n",result,fd,(int)length,error(result));
 	return result;
 }
 
@@ -2427,7 +2427,7 @@
 	instw_apply(&instw);
 
 	result=true_lchown(instw.translpath,owner,group);
-	log("%d\tlchown\t%s\t%d\t%d\t#%s\n",result,
+	logg("%d\tlchown\t%s\t%d\t%d\t#%s\n",result,
 	    instw.reslvpath,owner,group,error(result));
 	    
 	instw_delete(&instw);
@@ -2471,7 +2471,7 @@
 	instw_apply(&instw_n);
 	
 	result=true_link(instw_o.translpath,instw_n.translpath);
-	log("%d\tlink\t%s\t%s\t#%s\n",result,
+	logg("%d\tlink\t%s\t%s\t#%s\n",result,
 	    instw_o.reslvpath,instw_n.reslvpath,error(result));
 	    
 	instw_delete(&instw_o);
@@ -2510,7 +2510,7 @@
 	instw_apply(&instw);
 
 	result=true_mkdir(instw.translpath,mode);
-	log("%d\tmkdir\t%s\t#%s\n",result,instw.reslvpath,error(result));
+	logg("%d\tmkdir\t%s\t#%s\n",result,instw.reslvpath,error(result));
 
 	instw_delete(&instw);
 
@@ -2548,7 +2548,7 @@
 	backup(instw.truepath);
 
 	result=true_xmknod(version,instw.translpath,mode,dev);
-	log("%d\tmknod\t%s\t#%s\n",result,instw.reslvpath,error(result));
+	logg("%d\tmknod\t%s\t#%s\n",result,instw.reslvpath,error(result));
 
 	instw_delete(&instw);
 	
@@ -2603,7 +2603,7 @@
 		result=true_open(instw.path,flags,mode);
 	
 	if(flags & (O_WRONLY | O_RDWR)) 
-		log("%d\topen\t%s\t#%s\n",result,instw.reslvpath,error(result));
+		logg("%d\topen\t%s\t#%s\n",result,instw.reslvpath,error(result));
 
 	instw_delete(&instw);
 
@@ -2763,7 +2763,7 @@
 	instw_apply(&newinstw);
 
 	result=true_rename(oldinstw.translpath,newinstw.translpath);
-	log("%d\trename\t%s\t%s\t#%s\n",result,
+	logg("%d\trename\t%s\t%s\t#%s\n",result,
 	    oldinstw.reslvpath,newinstw.reslvpath,error(result));
 
 	instw_delete(&oldinstw);
@@ -2799,7 +2799,7 @@
 	instw_apply(&instw);
 
 	result=true_rmdir(instw.translpath);
-	log("%d\trmdir\t%s\t#%s\n",result,instw.reslvpath,error(result));
+	logg("%d\trmdir\t%s\t#%s\n",result,instw.reslvpath,error(result));
 	
 	instw_delete(&instw);
 	
@@ -2948,7 +2948,7 @@
 	instw_apply(&instw_slink);
 	
 	result=true_symlink(pathname,instw_slink.translpath);
-	log("%d\tsymlink\t%s\t%s\t#%s\n",
+	logg("%d\tsymlink\t%s\t%s\t#%s\n",
            result,instw.path,instw_slink.reslvpath,error(result));
 
 	    
@@ -2989,7 +2989,7 @@
 	instw_apply(&instw);
 
 	result=true_truncate(instw.translpath,length);
-	log("%d\ttruncate\t%s\t%d\t#%s\n",result,
+	logg("%d\ttruncate\t%s\t%d\t#%s\n",result,
 	    instw.reslvpath,(int)length,error(result));
 
 	instw_delete(&instw);
@@ -3028,7 +3028,7 @@
 	instw_apply(&instw);
 
 	result=true_unlink(instw.translpath);
-	log("%d\tunlink\t%s\t#%s\n",result,instw.reslvpath,error(result));
+	logg("%d\tunlink\t%s\t#%s\n",result,instw.reslvpath,error(result));
 
 	instw_delete(&instw);
 
@@ -3064,7 +3064,7 @@
 	instw_apply(&instw);
 
 	result=true_utime(instw.translpath,newtimes);
-	log("%d\tutime\t%s\t#%s\n",result,instw.reslvpath,error(result));
+	logg("%d\tutime\t%s\t#%s\n",result,instw.reslvpath,error(result));
 
 	instw_delete(&instw);
 
@@ -3105,7 +3105,7 @@
 	instw_apply(&instw);
 
 	result=true_open64(instw.translpath,O_CREAT | O_WRONLY | O_TRUNC, mode);
-	log("%d\tcreat\t%s\t#%s\n",result,instw.reslvpath,error(result));
+	logg("%d\tcreat\t%s\t#%s\n",result,instw.reslvpath,error(result));
 
 	instw_delete(&instw);
 
@@ -3125,7 +3125,7 @@
 #endif
 
 	result = true_ftruncate64(fd, length);
-	log("%d\tftruncate\t%d\t%d\t#%s\n",result,fd,(int)length,error(result));
+	logg("%d\tftruncate\t%d\t%d\t#%s\n",result,fd,(int)length,error(result));
 	return result;
 }
 
@@ -3173,7 +3173,7 @@
 	}
 
 	if(mode[0]=='w'||mode[0]=='a'||mode[1]=='+') 
-		log("%d\tfopen64\t%s\t#%s\n",(int)result,
+		logg("%d\tfopen64\t%s\t#%s\n",(int)result,
 		    instw.reslvpath,error(result));
 
 	instw_delete(&instw);
@@ -3232,7 +3232,7 @@
 	}
 	
 	if(flags & (O_WRONLY | O_RDWR)) 
-		log("%d\topen\t%s\t#%s\n",result,
+		logg("%d\topen\t%s\t#%s\n",result,
 		    instw.reslvpath,error(result));
 
 	instw_delete(&instw);
@@ -3403,7 +3403,7 @@
 
 	result=true_truncate64(instw.translpath,length);
 	
-	log("%d\ttruncate\t%s\t%d\t#%s\n",result,
+	logg("%d\ttruncate\t%s\t%d\t#%s\n",result,
 	    instw.reslvpath,(int)length,error(result));
 
 	instw_delete(&instw);