Changeset 2211 for trunk/auto-reply

Timestamp:

08/17/00 07:02:25 (8 years ago)

Author:

graham

Message:

Added two new options, FailOnExitCode? and AbortDeleteOnExitCode? which
allows the reply to be aborted if the exit code of the program is non-zero.

Location:

trunk/auto-reply

Files:

• licq_autoreply.conf (modified) (1 diff)
• src/autoreply.cpp (modified) (6 diffs)
• src/autoreply.h (modified) (2 diffs)

trunk/auto-reply/licq_autoreply.conf

@@ -23 +23 @@
 PassMessage = 0
 
+# If this is set, then the exit code of the command will
+# be used to determine if the message should be sent or
+# not.  A non-zero code will cause the reply to be aborted.
+FailOnExitCode = 0
+
+# This value is used if the above is set and the exit code
+# is non zero.  If set then a bad exit code will not delete
+# the relevant message.  If not set then the event will be
+# erased even if the command exit code is non-zero.
+AbortDeleteOnExitCode = 1
+
 
 # Here is a simple example which will bounce the event

trunk/auto-reply/src/autoreply.cpp

@@ -85 +85 @@
   conf.ReadStr("Arguments", m_szArguments, "");
   conf.ReadBool("PassMessage", m_bPassMessage, false);
+  conf.ReadBool("FailOnExitCode", m_bFailOnExitCode, false);
+  conf.ReadBool("AbortDeleteOnExitCode", m_bAbortDeleteOnExitCode, false);
   conf.CloseFile();
 
@@ -286 +288 @@
     m_szMessage[pos++] = c;
   }
-  PClose();
+  int r = 0;
+  if ((r = PClose()) != 0 && m_bFailOnExitCode)
+  {
+    gLog.Warn("%s%s returned abnormally: exit code %d\n", L_AUTOREPxSTR,
+     szCommand, r);
+    return !m_bAbortDeleteOnExitCode;
+  }
 
   char *szText = new char[4096 + 256];
@@ -367 +375 @@
 
 
-void CLicqAutoReply::PClose()
+int CLicqAutoReply::PClose()
 {
    int r, pstat;
+   struct timeval tv = { 0, 200000 };
 
    // Close the file descriptors
@@ -379 +388 @@
    r = waitpid(pid, &pstat, WNOHANG);
    // Return if child has exited or there was an inor
-   if (r == pid || r == -1) return;
+   if (r == pid || r == -1) goto pclose_done;
 
    // Give the process another .2 seconds to die
-   struct timeval tv = { 0, 200000 };
    select(0, NULL, NULL, NULL, &tv);
 
    // Still there?
    r = waitpid(pid, &pstat, WNOHANG);
-   if (r == pid || r == -1) return;
+   if (r == pid || r == -1) goto pclose_done;
 
    // Try and kill the process
-   if (kill(pid, SIGTERM) == -1) return;
+   if (kill(pid, SIGTERM) == -1) return -1;
 
    // Give it 1 more second to die
@@ -399 +407 @@
    // See if the child is still there
    r = waitpid(pid, &pstat, WNOHANG);
-   if (r == pid || r == -1) return;
+   if (r == pid || r == -1) goto pclose_done;
 
    // Kill the bastard
@@ -405 +413 @@
    // Now he will die for sure
    waitpid(pid, &pstat, 0);
-}
-
-
+
+pclose_done:
+
+   if (WIFEXITED(pstat)) return WEXITSTATUS(pstat);
+   return -1;
+
+}
+
+

trunk/auto-reply/src/autoreply.h

@@ -27 +27 @@
   char *m_szStatus;
   char m_szProgram[512], m_szArguments[512];
-  bool m_bPassMessage;
+  bool m_bPassMessage, m_bFailOnExitCode, m_bAbortDeleteOnExitCode;
 
   CICQDaemon *licqDaemon;
@@ -41 +41 @@
 
   bool POpen(const char *cmd);
-  void PClose();
+  int PClose();
 
 protected: