in_tail: start using our new POSIX emulation

In this commit, we actually start using "win32.h" in various parts of
in_tail.

This commit removes a lot of Windows-specific ifdefs in the code base,
since we don't need them anymore thanks to our new POSIX emulation.

Signed-off-by: Fujimoto Seiji <[email protected]>

Author: fujimotos

plugins/in_tail/tail_file.c

@@ -41,55 +41,15 @@
 #include "tail_multiline.h"
 #include "tail_scan.h"
 
-#ifdef _MSC_VER
-static int get_inode(int fd, uint64_t *inode, struct flb_tail_config *ctx)
-{
-    HANDLE h;
-    BY_HANDLE_FILE_INFORMATION info;
-
-    h = _get_osfhandle(fd);
-    if (h == INVALID_HANDLE_VALUE) {
-        flb_plg_error(ctx->ins, "cannot convert fd:%i into HANDLE", fd);
-        return -1;
-    }
-
-    if (GetFileInformationByHandle(h, &info) == 0) {
-        flb_plg_error(ctx->ins, "cannot get file info for fd:%i", fd);
-        return -1;
-    }
-    *inode = (uint64_t) info.nFileIndexHigh;
-    *inode = *inode << 32 | info.nFileIndexLow;
-    return 0;
-}
+#ifdef FLB_SYSTEM_WINDOWS
+#include "win32.h"
 #endif
 
 static inline void consume_bytes(char *buf, int bytes, int length)
 {
     memmove(buf, buf + bytes, length - bytes);
 }
 
-#ifdef _MSC_VER
-/*
- * Open a file for reading. We need to use CreateFileA() instead of
- * open(2) to avoid automatic file locking.
- */
-static int open_file(const char *path)
-{
-    HANDLE h;
-    h = CreateFileA(path,
-                    GENERIC_READ,
-                    FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
-                    NULL,           /* lpSecurityAttributes */
-                    OPEN_EXISTING,  /* dwCreationDisposition */
-                    0,              /* dwFlagsAndAttributes */
-                    NULL);          /* hTemplateFile */
-    if (h == INVALID_HANDLE_VALUE) {
-        return -1;
-    }
-    return _open_osfhandle((intptr_t) h, _O_RDONLY);
-}
-#endif
-
 static int unpack_and_pack(msgpack_packer *pck, msgpack_object *root,
                            const char *key, size_t key_len,
                            const char *val, size_t val_len)
@@ -599,11 +559,7 @@ int flb_tail_file_append(char *path, struct stat *st, int mode,
         return -1;
     }
 
-#ifdef _MSC_VER
-    fd = open_file(path);
-#else
     fd = open(path, O_RDONLY);
-#endif
     if (fd == -1) {
         flb_errno();
         flb_plg_error(ctx->ins, "cannot open %s", path);
@@ -621,7 +577,6 @@ int flb_tail_file_append(char *path, struct stat *st, int mode,
     file->fd        = fd;
 
     /* On non-windows environments check if the original path is a link */
-#ifndef _MSC_VER
     struct stat lst;
     ret = lstat(path, &lst);
     if (ret == 0) {
@@ -630,7 +585,6 @@ int flb_tail_file_append(char *path, struct stat *st, int mode,
             file->link_inode = lst.st_ino;
         }
     }
-#endif
 
     /*
      * Duplicate string into 'file' structure, the called function
@@ -649,13 +603,7 @@ int flb_tail_file_append(char *path, struct stat *st, int mode,
         goto error;
     }
 
-#ifdef _MSC_VER
-    if (get_inode(fd, &file->inode, ctx)) {
-        goto error;
-    }
-#else
     file->inode     = st->st_ino;
-#endif
     file->offset    = 0;
     file->size      = st->st_size;
     file->buf_len   = 0;

plugins/in_tail/tail_file.h

@@ -32,6 +32,10 @@
 #include "tail_config.h"
 #include "tail_file_internal.h"
 
+#ifdef FLB_SYSTEM_WINDOWS
+#include "win32.h"
+#endif
+
 #ifdef FLB_HAVE_REGEX
 #define FLB_HASH_TABLE_SIZE 50
 #endif

plugins/in_tail/tail_fs_stat.c

@@ -31,6 +31,10 @@
 #include "tail_config.h"
 #include "tail_signal.h"
 
+#ifdef FLB_SYSTEM_WINDOWS
+#include "win32.h"
+#endif
+
 struct fs_stat {
     /* last time check */
     time_t checked;
@@ -145,25 +149,6 @@ static int tail_fs_check(struct flb_input_instance *ins,
             file->pending_bytes = 0;
         }
 
-#ifdef FLB_SYSTEM_WINDOWS
-        HANDLE h;
-        FILE_STANDARD_INFO info;
-
-        h = _get_osfhandle(file->fd);
-        if (GetFileInformationByHandleEx(h, FileStandardInfo,
-                                         &info, sizeof(info))) {
-            if (info.DeletePending) {
-                flb_plg_debug(ctx->ins, "file is to be delete: %s", file->name);
-#ifdef FLB_HAVE_SQLDB
-                if (ctx->db) {
-                    flb_tail_db_file_delete(file, ctx);
-                }
-#endif
-                flb_tail_file_remove(file);
-                continue;
-            }
-        }
-#endif
 
         /* Discover the current file name for the open file descriptor */
         name = flb_tail_file_name(file);

plugins/in_tail/tail_scan_win32.c

@@ -28,15 +28,15 @@
 #include <fluent-bit/flb_input_plugin.h>
 #include <fluent-bit/flb_utils.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <shlwapi.h>
 
 #include "tail.h"
 #include "tail_file.h"
 #include "tail_signal.h"
 #include "tail_config.h"
 
+#include "win32.h"
+
 static int tail_is_excluded(char *path, struct flb_tail_config *ctx)
 {
     struct mk_list *head;