Changeset 425 for trunk/src/sh_log_check.c

Timestamp:

Feb 20, 2013, 7:30:02 PM (12 years ago)

Author:

katerina

Message:

Fix for tickets #329, #330, #331, #332

File:

• trunk/src/sh_log_check.c (modified) (1 diff)

trunk/src/sh_log_check.c

@@ -577 +577 @@
  * Search rotated logfile
  */
-#include <unistd.h>
-#include <libgen.h>
-#include <dirent.h>
-
-char * sh_rotated_log_search(const char * path, struct stat * buf)
-{
-
-  size_t size;
-  int    i;
-  char * searchpath;
-  struct stat sbuf;
-  DIR  * dp;
-  char * dname;
-  char * bname;
-
-  dname  = sh_util_dirname(path);
-  bname  = sh_util_basename(path);
-
-  size = strlen(dname) + strlen(bname) + 4;
-  searchpath = SH_ALLOC(size);
-
-  for (i = 0; i < 2; ++i)
-    {
-      snprintf(searchpath, size, "%s/%s.%1d", dname, bname, i);
-      if (0 == stat(searchpath, &sbuf) && sbuf.st_ino == buf->st_ino)
-        {
-          SH_FREE(dname);
-          SH_FREE(bname);
-          return searchpath;
-        }
-    }
-
-  SH_FREE(searchpath);
-
-  if (NULL != (dp = opendir(dname)))
-    {
-      struct dirent * de;
-
-      while (NULL != (de = readdir(dp)))
-        {
-          if (0 == strcmp(de->d_name, ".") || 0 == strcmp(de->d_name, ".."))
-            continue;
-
-          size = strlen(dname) + strlen(de->d_name) + 2;
-          searchpath = SH_ALLOC(size);
-          snprintf(searchpath, size, "%s/%s", dname, de->d_name);
-
-          if (0 == stat(searchpath, &sbuf) && sbuf.st_ino == buf->st_ino)
-            {
-              SH_FREE(dname);
-              SH_FREE(bname);
-              closedir(dp);
-              return searchpath;
-            }
-          
-          SH_FREE(searchpath);
-        }
-      closedir(dp);
-    }
-
-  SH_FREE(dname);
-  SH_FREE(bname);
-
-  return NULL;
-}
+extern char * sh_rotated_log_search(const char * path, struct stat * buf);
+
 
 /* Open file, position at stored offset