op/patches: op-add-logging-to-filename.diff

main.c

@@ -85 +85 @@
 int gargc = -1;
 char **gargv = NULL;
 sigset_t sig_mask, old_sig_mask;
+FILE *logfile = NULL;
 
 void Usage()
 {
@@ -772 +773 @@
         char            *new_envp[MAXENV];
         char            *new_argv[MAXARG];
         char            str[MAXSTRLEN];
+        char            *logfilename;
         struct stat st;
+        struct timeval  tv;
+        struct tm       *tmsp;
+        struct timezone tz;
 
 #ifdef XAUTH
         if (getenv("DISPLAY") != NULL && (cp = FindOpt(cmd, "xauth")) != NULL) {
@@ -941 +946 @@
                 minimum_logging_level = LOG_NOTICE;
         }
 
+        /* option "log=syslog"    enable logging via syslog()                 */
+        /* option "log=<dirname>" enable logging in filename <dirname>/opxxx  */
+        /*                        where xxx is the day in year number         */
+
+        if ((cp = FindOpt(cmd, "log")) != NULL)
+        {
+                if ((cp = GetField(cp, str, MAXSTRLEN)) != NULL)
+        {
+                if (strcmp(str, "syslog") != 0)
+                {
+                        logfilename = malloc(strlen(str) + 11);
+                        sprintf(logfilename, str);
+
+                        gettimeofday(&tv, &tz);
+                        tmsp = localtime(&tv.tv_sec);
+                        sprintf(logfilename + strlen(str), "/op%d.log", tmsp->tm_yday + 1);
+                        if ((logfile = fopen(logfilename, "a")) == NULL)
+                                fatal(1, "cannot open logfile '%s', aborting.", logfilename);
+                        chmod(logfilename, 0640);
+                }
+        }
+        else
+                logger(LOG_ERR, "missing \"log\" directory, syslog assumed.");
+        }
+
         if (FindOpt(cmd, "environment") == NULL) {
                 for (i = 0; i < cmd->nopts; i++) {
                         if (cmd->opts[i][0] != '$')
@@ -1144 +1174 @@
 int vlogger(unsigned level, const char *format, va_list args) {
 char buffer[MAXSTRLEN], buffer2[MAXSTRLEN], buffer3[MAXSTRLEN];
 char *username = "unknown";
+struct tm       *t;
+time_t          curtime;
 
         if (level >= minimum_logging_level) return -1;
 
@@ -1165 +1197 @@
                 format_cmd(gargc, gargv, buffer3, MAXSTRLEN),
                 buffer2);
 #endif
-        syslog(level, "%s", buffer);
+        if (logfile == NULL)
+                syslog(level, "%s", buffer);
+        else
+        {
+                curtime = time(NULL);
+                t = localtime(&curtime);
+                fprintf(logfile, "[%02d/%02d/%04d %02d:%02d:%02d] ",
+                t->tm_mday, t->tm_mon + 1, t->tm_year + 1900,
+                t->tm_hour, t->tm_min, t->tm_sec);
+                fprintf(logfile, "%s\n", buffer);
+                fflush(logfile);
+        }
+
         return -1;
 }
 
@@ -1193 +1237 @@
         va_end(ap);
         exit(1);
 }
-