cbb6a6bf82
a user named "log"; from sarg bugtracker via freebsd also, fix sprintf and rcs id; from maintainer Douglas Santos thanks to aanriot@, who found some errors when i merged Douglas Santos diff ok aanriot@ and maintainer Douglas Santos
32 lines
1.0 KiB
Plaintext
32 lines
1.0 KiB
Plaintext
$OpenBSD: patch-report_c,v 1.1 2007/06/22 12:48:25 martynas Exp $
|
|
--- report.c.orig Tue Jan 2 21:11:26 2007
|
|
+++ report.c Tue Jun 19 20:26:14 2007
|
|
@@ -46,6 +46,7 @@ void gerarel()
|
|
long long int incache=0;
|
|
long long int oucache=0;
|
|
char *s;
|
|
+ char *haystack;
|
|
DIR *dirp;
|
|
struct dirent *direntp;
|
|
|
|
@@ -73,7 +74,9 @@ void gerarel()
|
|
|
|
dirp = opendir(tmp);
|
|
while ((direntp = readdir( dirp )) != NULL ) {
|
|
- if((strstr(direntp->d_name,".log") == 0) ||
|
|
+ haystack=direntp->d_name;
|
|
+ haystack+=(strlen(haystack)-5);
|
|
+ if((strstr(haystack,".log") == 0) ||
|
|
(strncmp(direntp->d_name,"download.log",12) == 0) ||
|
|
(strncmp(direntp->d_name,"denied.log",10) == 0) ||
|
|
(strncmp(direntp->d_name,"authfail.log.unsort",19) == 0))
|
|
@@ -89,7 +92,7 @@ void gerarel()
|
|
getword(wname2,wdname,'.');
|
|
strcat(user,wname2);
|
|
|
|
- if(strcmp(wdname,"log") !=0) {
|
|
+ if((strcmp(wdname,"log")!=0) || (strlen(wdname)>3)) {
|
|
strcat(user,".");
|
|
goto strip_prefix;
|
|
}
|