comments and whitespace cleanup

1 files changed, 35 insertions, 38 deletions

diff --git a/log.c b/log.c
index 67e37b4..fe6d824 100644
--- a/log.c
+++ b/log.c
@@ -17,9 +17,6 @@
   |          Ben Fuhrmannek <ben.fuhrmannek@sektioneins.de>              |
   +----------------------------------------------------------------------+
 */
-/*
-  $Id: log.c,v 1.1.1.1 2007-11-28 01:15:35 sesser Exp $ 
-*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -82,7 +79,7 @@ static HANDLE log_source = 0;
 //          case S_VARS:
 //              return "VARS";
 //          default:
-//              return "UNKNOWN";    
+//              return "UNKNOWN";
 //      }
 // }
 
@@ -129,7 +126,7 @@ SUHOSIN7_API void suhosin_log(int loglevel, char *fmt, ...)
                 volatile unsigned int *x = 0;
                 volatile int y = *x;
         }
-        
+
         if (SUHOSIN7_G(log_use_x_forwarded_for)) {
                 ip_address = suhosin_getenv("HTTP_X_FORWARDED_FOR", 20);
                 if (ip_address == NULL) {
@@ -141,8 +138,8 @@ SUHOSIN7_API void suhosin_log(int loglevel, char *fmt, ...)
                         ip_address = "REMOTE_ADDR not set";
                 }
         }
-        
-        
+
+
         va_start(ap, fmt);
         ap_php_vsnprintf(error, sizeof(error), fmt, ap);
         va_end(ap);
@@ -150,13 +147,13 @@ SUHOSIN7_API void suhosin_log(int loglevel, char *fmt, ...)
                 if (error[i] < 32) error[i] = '.';
                 i++;
         }
-        
+
         if (SUHOSIN7_G(simulation)) {
                 alertstring = "ALERT-SIMULATION";
         } else {
                 alertstring = "ALERT";
         }
-        
+
         if (zend_is_executing()) {
                 // zend_execute_data *exdata = EG(current_execute_data);
                 // if (exdata) {
@@ -182,25 +179,25 @@ SUHOSIN7_API void suhosin_log(int loglevel, char *fmt, ...)
                 }
                 ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s')", alertstring, error, ip_address, fname);
         }
-                        
+
         /* Syslog-Logging disabled? */
 //      if (((SUHOSIN7_G(log_syslog)|S_INTERNAL) & loglevel)==0) {
 //              goto log_file;
-//      }       
-//      
+//      }
+//
 // #if defined(AF_UNIX)
 //      ap_php_snprintf(error, sizeof(error), "<%u>suhosin[%u]: %s\n", (unsigned int)(SUHOSIN7_G(log_syslog_facility)|SUHOSIN7_G(log_syslog_priority)),getpid(),buf);
-// 
+//
 //      s = socket(AF_UNIX, SOCK_DGRAM, 0);
 //      if (s == -1) {
 //              goto log_file;
 //      }
-//      
+//
 //      memset(&saun, 0, sizeof(saun));
 //      saun.sun_family = AF_UNIX;
 //      strcpy(saun.sun_path, SYSLOG_PATH);
 //      /*saun.sun_len = sizeof(saun);*/
-//      
+//
 //      r = connect(s, (struct sockaddr *)&saun, sizeof(saun));
 //      if (r) {
 //              close(s);
@@ -208,25 +205,25 @@ SUHOSIN7_API void suhosin_log(int loglevel, char *fmt, ...)
 //              if (s == -1) {
 //                      goto log_file;
 //              }
-//      
+//
 //              memset(&saun, 0, sizeof(saun));
 //              saun.sun_family = AF_UNIX;
 //              strcpy(saun.sun_path, SYSLOG_PATH);
 //              /*saun.sun_len = sizeof(saun);*/
-// 
+//
 //              r = connect(s, (struct sockaddr *)&saun, sizeof(saun));
-//              if (r) { 
+//              if (r) {
 //                      close(s);
 //                      goto log_file;
 //              }
 //      }
 //      send(s, error, strlen(error), 0);
-//      
+//
 //      close(s);
 // #endif
 // #ifdef PHP_WIN32
 //      ap_php_snprintf(error, sizeof(error), "suhosin[%u]: %s", getpid(),buf);
-// 
+//
 //      switch (SUHOSIN7_G(log_syslog_priority)) {                      /* translate UNIX type into NT type */
 //              case 1: /*LOG_ALERT:*/
 //                      etype = EVENTLOG_ERROR_TYPE;
@@ -244,14 +241,14 @@ SUHOSIN7_API void suhosin_log(int loglevel, char *fmt, ...)
 //              log_source = RegisterEventSource(NULL, "Suhosin-" SUHOSIN_EXT_VERSION);
 //      }
 //      ReportEvent(log_source, etype, (unsigned short) SUHOSIN7_G(log_syslog_priority), evid, NULL, 1, 0, strs, NULL);
-//      
+//
 // #endif
 log_file:
         /* File-Logging disabled? */
         if ((SUHOSIN7_G(log_file) & loglevel)==0) {
                 goto log_sapi;
         }
-        
+
         if (!SUHOSIN7_G(log_filename) || !SUHOSIN7_G(log_filename)[0]) {
                 goto log_sapi;
         }
@@ -300,20 +297,20 @@ log_sapi:
 //              FILE *in;
 //              int space;
 //              struct stat st;
-//              
+//
 //              char *sname = SUHOSIN7_G(log_scriptname);
 //              while (isspace(*sname)) ++sname;
 //              if (*sname == 0) goto log_phpscript;
-//              
+//
 //              if (VCWD_STAT(sname, &st) < 0) {
 //                      suhosin_log(S_INTERNAL, "unable to find logging shell script %s - file dropped", sname);
 //                      goto log_phpscript;
 //              }
 //              if (access(sname, X_OK|R_OK) < 0) {
 //                      suhosin_log(S_INTERNAL, "logging shell script %s is not executable - file dropped", sname);
-//                      goto log_phpscript;                                     
+//                      goto log_phpscript;
 //              }
-//              
+//
 //              /* TODO: clean up this code to calculate size of output dynamically */
 //              ap_php_snprintf(cmd, sizeof(cmd) - 20, "%s %s \'", sname, loglevel2string(loglevel));
 //              space = sizeof(cmd) - strlen(cmd) - 20;
@@ -341,7 +338,7 @@ log_sapi:
 //              *cmdpos++ = '&';
 //              *cmdpos++ = '1';
 //              *cmdpos = 0;
-//              
+//
 //              if ((in=VCWD_POPEN(cmd, "r"))==NULL) {
 //                      suhosin_log(S_INTERNAL, "Unable to execute logging shell script: %s", sname);
 //                      goto log_phpscript;
@@ -366,10 +363,10 @@ log_sapi:
 //              zend_file_handle file_handle;
 //              zend_op_array *new_op_array;
 //              zval *result = NULL;
-//              
+//
 //              long orig_execution_depth = SUHOSIN7_G(execution_depth);
 //              char *orig_basedir = PG(open_basedir);
-//              
+//
 //              char *phpscript = SUHOSIN7_G(log_phpscriptname);
 //              SDEBUG("scriptname %s", SUHOSIN7_G(log_phpscriptname));
 //              if (zend_stream_open(phpscript, &file_handle) == SUCCESS) {
@@ -381,34 +378,34 @@ log_sapi:
 //                      if (new_op_array) {
 //                              HashTable *active_symbol_table = EG(active_symbol_table);
 //                              zval *zerror, *zerror_class;
-//                              
+//
 //                              if (active_symbol_table == NULL) {
 //                                      active_symbol_table = &EG(symbol_table);
 //                              }
 //                              EG(return_value_ptr_ptr) = &result;
 //                              EG(active_op_array) = new_op_array;
-//                              
+//
 //                              MAKE_STD_ZVAL(zerror);
 //                              MAKE_STD_ZVAL(zerror_class);
 //                              ZVAL_STRING(zerror, buf, 1);
 //                              ZVAL_LONG(zerror_class, loglevel);
-// 
+//
 //                              zend_hash_update(active_symbol_table, "SUHOSIN_ERROR", sizeof("SUHOSIN_ERROR"), (void **)&zerror, sizeof(zval *), NULL);
 //                              zend_hash_update(active_symbol_table, "SUHOSIN_ERRORCLASS", sizeof("SUHOSIN_ERRORCLASS"), (void **)&zerror_class, sizeof(zval *), NULL);
-//                              
+//
 //                              SUHOSIN7_G(execution_depth) = 0;
 //                              if (SUHOSIN7_G(log_phpscript_is_safe)) {
 //                                      PG(open_basedir) = NULL;
 //                              }
-//                              
+//
 //                              zend_execute(new_op_array);
-//                              
+//
 //                              SUHOSIN7_G(execution_depth) = orig_execution_depth;
 //                              PG(open_basedir) = orig_basedir;
-//                              
+//
 //                              destroy_op_array(new_op_array);
 //                              efree(new_op_array);
-// 
+//
 //                              if (!EG(exception))
 //                              {
 //                                      if (EG(return_value_ptr_ptr)) {
@@ -425,7 +422,7 @@ log_sapi:
 //                      return;
 //              }
 //      }
-// 
+//
 }