Adding ability to specify timeout for tail widget when following a file

5 files changed, 88 insertions, 6 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 38b1afe..5131cd8 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -34,9 +34,44 @@
 #   acinclude.m4 - custom m4 macros used by configure.ac
 #
 
-# AC_OPENVPN_LDAPCMD_COMPONENTS
+# AC_SCU_WIDGET_TAIL
 # ______________________________________________________________________________
-AC_DEFUN([AC_SCU_ZCAT_DEPS],[dnl
+AC_DEFUN([AC_SCU_WIDGET_TAIL],[dnl
+
+   withval=""
+   AC_ARG_WITH(
+      tail-timeout,
+      [AS_HELP_STRING([--with-tail-timeout=seconds], [terminate tail after seconds [0]])],
+      [ WTAIL_TIMEOUT=$withval ],
+      [ WTAIL_TIMEOUT=$withval ]
+   )
+
+   if test "x${WTAIL_TIMEOUT}" == "xyes";then
+      WTAIL_TIMEOUT=3600
+   elif test "x${WTAIL_TIMEOUT}" == "xno";then
+      WTAIL_TIMEOUT=0
+   elif test "x${WTAIL_TIMEOUT}" == "x";then
+      WTAIL_TIMEOUT=0
+   else
+      case $WTAIL_TIMEOUT in
+      ''|*[!0-9]*)
+      AC_MSG_ERROR([tail timeout must be a numeric value.])
+      ;;
+
+      *)
+      ;;
+      esac
+   fi
+   SCU_TAIL_TIMEOUT=${WTAIL_TIMEOUT}
+
+   AC_DEFINE_UNQUOTED(SCU_TAIL_TIMEOUT, ${SCU_TAIL_TIMEOUT}, [Timeout value for tail widget])
+
+])dnl
+
+
+# AC_SCU_WIDGET_ZCAT
+# ______________________________________________________________________________
+AC_DEFUN([AC_SCU_WIDGET_ZCAT],[dnl
 
    enableval=""
    AC_ARG_ENABLE(
@@ -59,6 +94,13 @@ AC_DEFUN([AC_SCU_ZCAT_DEPS],[dnl
       [ EZLIB=$enableval ],
       [ EZLIB=$enableval ]
    )
+   withval=""
+   AC_ARG_WITH(
+      tail-timeout,
+      [AS_HELP_STRING([--with-tail-timeout=seconds], [terminate tail after seconds [0]])],
+      [ WTAIL_TIMEOUT=$withval ],
+      [ WTAIL_TIMEOUT=$withval ]
+   )
 
    # check zlib
    USE_ZLIB=no;
diff --git a/configure.ac b/configure.ac
index 5a97403..541066e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,7 +163,8 @@ AC_BINDLE_GIT_PACKAGE_VERSION([contrib/bindletools/build-aux/git-package-version
 
 # custom configure options
 AC_BINDLE_ENABLE_WARNINGS
-AC_SCU_ZCAT_DEPS
+AC_SCU_WIDGET_TAIL
+AC_SCU_WIDGET_ZCAT
 
 
 # enables getopt_long if header and functions were found
@@ -180,6 +181,13 @@ AC_MSG_NOTICE([ ])
 AC_MSG_NOTICE([   Secure Core Utilities $GIT_PACKAGE_VERSION ($GIT_PACKAGE_BUILD)])
 AC_MSG_NOTICE([ ])
 AC_MSG_NOTICE([   Features:])
+if test "x${SCU_TAIL_TIMEOUT}" = "x0";then
+   AC_MSG_NOTICE([      tail timeout:              none)])
+else
+   AC_MSG_NOTICE([      tail timeout:              $SCU_TAIL_TIMEOUT seconds])
+fi
+AC_MSG_NOTICE([ ])
+AC_MSG_NOTICE([   Support:])
 AC_MSG_NOTICE([      zlib support:              $USE_ZLIB])
 AC_MSG_NOTICE([      bzip2 support:             $USE_BZIP2])
 AC_MSG_NOTICE([      lzma support:              $USE_LZMA])
diff --git a/src/securecoreutils.h b/src/securecoreutils.h
index b29a16c..ff1990f 100644
--- a/src/securecoreutils.h
+++ b/src/securecoreutils.h
@@ -85,6 +85,11 @@
 #endif
 
 
+#ifndef SCU_TAIL_TIMEOUT
+#define SCU_TAIL_TIMEOUT 0
+#endif
+
+
 #ifdef LINE_MAX
 #   define SCU_LINE_MAX LINE_MAX
 #elif defined _POSIX2_LINE_MAX
diff --git a/src/widget-tail.c b/src/widget-tail.c
index 63ef5a4..69ed7c3 100644
--- a/src/widget-tail.c
+++ b/src/widget-tail.c
@@ -54,6 +54,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <time.h>
+#include <signal.h>
 
 
 ///////////////////
@@ -80,6 +81,15 @@ int scu_widget_tail_lines(scu_config * cnf, int fd, struct stat * sb,
    size_t opts, off_t optnum);
 
 
+////////////////
+//            //
+//  Variable  //
+//            //
+////////////////
+
+static int timeout_alarmed = 0;
+
+
 /////////////////
 //             //
 //  Functions  //
@@ -332,10 +342,16 @@ int scu_widget_tail_follow(scu_config * cnf, int fd)
    ssize_t           len;
    struct timespec   ts;
 
-   ts.tv_sec  = 0;
-   ts.tv_nsec = 10000000;
+   ts.tv_sec       = 0;
+   ts.tv_nsec      = 10000000;
+   timeout_alarmed = 0;
+
+#if (SCU_TAIL_TIMEOUT > 0)
+   signal(SIGALRM, scu_widget_tail_follow_alarm);
+   alarm(SCU_TAIL_TIMEOUT);
+#endif
 
-   while (1)
+   while (!(timeout_alarmed))
    {
       switch (len = read(fd, buff, sizeof(buff)))
       {
@@ -361,6 +377,16 @@ int scu_widget_tail_follow(scu_config * cnf, int fd)
 }
 
 
+void scu_widget_tail_follow_alarm(int sig)
+{
+   timeout_alarmed = 1;
+   signal (sig, scu_widget_tail_follow_alarm);
+   alarm(1);
+   fprintf(stderr, "\n\n*** TAIL WIDGET TIMEOUT EXPIRED ***\n\n\n");
+   return;
+}
+
+
 int scu_widget_tail_lines(scu_config * cnf, int fd, struct stat * sb,
    size_t opts, off_t optnum)
 {
diff --git a/src/widget-tail.h b/src/widget-tail.h
index 62ab0cf..f4aedcd 100644
--- a/src/widget-tail.h
+++ b/src/widget-tail.h
@@ -63,5 +63,6 @@
 int scu_widget_tail(scu_config * cnf);
 
 void scu_widget_tail_usage(scu_config * cnf);
+void scu_widget_tail_follow_alarm(int sig);
 
 #endif /* end of header */