Changeset 170 for trunk/src

Timestamp:

Apr 30, 2008, 11:56:45 PM (17 years ago)

Author:

katerina

Message:

Plenty of compiler warnings fixed, SQL query length fixed, doc update.

Location:

trunk/src

Files:

• cutest_sh_tiger0.c (modified) (1 diff)
• samhain.c (modified) (8 diffs)
• samhain_setpwd.c (modified) (4 diffs)
• sh_calls.c (modified) (23 diffs)
• sh_cat.c (modified) (3 diffs)
• sh_database.c (modified) (9 diffs)
• sh_entropy.c (modified) (1 diff)
• sh_err_console.c (modified) (3 diffs)
• sh_err_log.c (modified) (6 diffs)
• sh_err_syslog.c (modified) (1 diff)
• sh_error.c (modified) (13 diffs)
• sh_extern.c (modified) (3 diffs)
• sh_files.c (modified) (3 diffs)
• sh_forward.c (modified) (5 diffs)
• sh_getopt.c (modified) (5 diffs)
• sh_gpg.c (modified) (1 diff)
• sh_hash.c (modified) (73 diffs)
• sh_html.c (modified) (3 diffs)
• sh_ignore.c (modified) (1 diff)
• sh_mail.c (modified) (11 diffs)
• sh_mem.c (modified) (4 diffs)
• sh_portcheck.c (modified) (21 diffs)
• sh_prelude.c (modified) (4 diffs)
• sh_processcheck.c (modified) (10 diffs)
• sh_pthread.c (modified) (1 diff)
• sh_readconf.c (modified) (4 diffs)
• sh_socket.c (modified) (3 diffs)
• sh_static.c (modified) (4 diffs)
• sh_suidchk.c (modified) (4 diffs)
• sh_tiger0.c (modified) (4 diffs)
• sh_tiger1.c (modified) (1 diff)
• sh_tiger1_64.c (modified) (1 diff)
• sh_tools.c (modified) (2 diffs)
• sh_unix.c (modified) (16 diffs)
• sh_utils.c (modified) (8 diffs)
• sh_utmp.c (modified) (8 diffs)
• slib.c (modified) (14 diffs)
• trustfile.c (modified) (2 diffs)

trunk/src/cutest_sh_tiger0.c

@@ -10 +10 @@
 
 #if defined(HAVE_PTHREAD) && defined(SH_STEALTH)
-extern void sh_g_init();
+extern void sh_g_init(void);
 #endif
 
 
-static void init() {
+static void init(void) {
 
   extern unsigned char TcpFlag[8][PW_LEN+1];

trunk/src/samhain.c

@@ -167 +167 @@
 }
 
-void sh_g_init()
+void sh_g_init(void)
 {
   if (0 != pthread_key_create(&g_key, sh_g_destroy))
@@ -695 +695 @@
 #endif
 #if defined(SH_WITH_SERVER)
-  extern int sh_socket_remove ();
+  extern int sh_socket_remove (void);
 #endif
 
@@ -800 +800 @@
 #if defined(__linux__) || defined(sun) || defined(__sun) || defined(__sun__)
 #include <dirent.h>
-static pid_t * procdirSamhain ()
+static pid_t * procdirSamhain (void)
 {
-  volatile pid_t        * pidlist = malloc(sizeof(pid_t) * 65535);
-  pid_t        * dummy;
+  pid_t        * pidlist;
   struct dirent * d;
   DIR *        dp;
   long         ino;
   struct stat  buf;
-  int          i = 0;
+  int          i;
   pid_t        pid, mypid = getpid();
   char       * tail;
   char         exef[128];
 
-  if (!pidlist)
-    return NULL;
-
-  for (i = 0; i < 65535; ++i) pidlist[i] = 0;
-  i = 0;
-
   if (0 != stat(SH_INSTALL_PATH, &buf))
     {
-      dummy = (pid_t *)pidlist;
-      free(dummy);
       return NULL;
     }
@@ -830 +821 @@
   if (NULL == (dp = opendir("/proc")))
     {
-      dummy = (pid_t *)pidlist;
-      free(dummy);
       return NULL;
     }
@@ -837 +826 @@
   SH_MUTEX_LOCK(mutex_readdir);
 
+  pidlist =  malloc(sizeof(pid_t) * 65535);
+  if (!pidlist)
+    goto unlock_and_out;
+
+  for (i = 0; i < 65535; ++i) pidlist[i] = 0;
+
+  i = 0;
   while (NULL != (d = readdir(dp)) && i < 65535)
     {
@@ -858 +854 @@
     }
 
+ unlock_and_out:
+  ;
   SH_MUTEX_UNLOCK(mutex_readdir);
 
   closedir(dp);
-  return (pid_t *)pidlist;
+  return pidlist;
 }
 #else
-static pid_t * procdirSamhain ()
+static pid_t * procdirSamhain (void)
 {
   return NULL;
@@ -1191 +1189 @@
 #endif
 #if defined(SH_WITH_SERVER)
-  extern int    sh_create_tcp_socket();
+  extern int    sh_create_tcp_socket(void);
 #endif
 
@@ -1208 +1206 @@
 
   volatile time_t        told;
-  time_t        tcurrent;
+  volatile time_t        tcurrent;
   size_t        tzlen;
   char *        tzptr;

trunk/src/samhain_setpwd.c

@@ -231 +231 @@
   int    oldf;
   int    newf;
+  int    ret;
 
   unsigned long bytecount;
@@ -396 +397 @@
 
 
-      write (newf, buf, dat);
+      ret = write (newf, buf, dat);
+      if (dat > 0 && ret < 0)
+        {
+          fprintf(stdout, _("ERROR Cannot write to output file %s.\n"), newn);
+          fflush(stdout);
+          return EXIT_FAILURE;
+        }
     }
 
@@ -418 +425 @@
 
   dat = read (oldf, buf, (GRAB_SIZE / 2));
-  write (newf, buf, dat);
+  ret = write (newf, buf, dat);
+  if (dat > 0 && ret < 0)
+    {
+      fprintf(stdout, _("ERROR Cannot write to output file %s.\n"), newn);
+      fflush(stdout);
+      return EXIT_FAILURE;
+    }
 
   bytecount = 0;
@@ -469 +482 @@
         }
 
-      write (newf, buf, dat);
+      ret = write (newf, buf, dat);
+      if (dat > 0 && ret < 0)
+        {
+          fprintf(stdout, _("ERROR Cannot write to output file %s.\n"), newn);
+          fflush(stdout);
+          return EXIT_FAILURE;
+        }
     }
 

trunk/src/sh_calls.c

@@ -59 +59 @@
 typedef struct cht_struct 
 {
-  char           * str;
+  const char           * str;
   unsigned long    val;
 } cht_type;
@@ -109 +109 @@
 /* Need to catch EINTR for these functions.
  */
-long int retry_sigaction(char * file, int line,
+long int retry_sigaction(const char * file, int line,
                          int signum,  const  struct  sigaction  *act,
                          struct sigaction *oldact)
@@ -156 +156 @@
 
 
-long int retry_connect(char * file, int line, int sockfd, 
+long int retry_connect(const char * file, int line, int sockfd, 
                        struct sockaddr *serv_addr, int addrlen)
 {
@@ -209 +209 @@
 }
 
-long int retry_accept(char * file, int line, int fd, 
+long int retry_accept(const char * file, int line, int fd, 
                       struct sockaddr *serv_addr, int * addrlen)
 {
@@ -236 +236 @@
 }
 
-long int retry_lstat(char * file, int line, 
+long int retry_lstat(const char * file, int line, 
                      const char *file_name, struct stat *buf)
 {
@@ -259 +259 @@
 }
 
-long int retry_stat(char * file, int line, 
+long int retry_stat(const char * file, int line, 
                     const char *file_name, struct stat *buf)
 {
@@ -282 +282 @@
 }
 
-long int retry_fstat(char * file, int line, int filed, struct stat *buf)
+long int retry_fstat(const char * file, int line, int filed, struct stat *buf)
 {
   int error;
@@ -303 +303 @@
 }
 
-long int retry_fcntl(char * file, int line, int fd, int cmd, long arg)
+long int retry_fcntl(const char * file, int line, int fd, int cmd, long arg)
 {
   int error;
@@ -389 +389 @@
  ***************************************************/
 
-long int retry_aud_execve  (char * file, int line, 
+long int retry_aud_execve  (const char * file, int line, 
                             const  char *dateiname, char * argv[],
                             char * envp[])
@@ -419 +419 @@
 
 
-long int retry_aud_utime (char * file, int line, 
-                           char * path, struct utimbuf *buf)
+long int retry_aud_utime (const char * file, int line, 
+                          char * path, struct utimbuf *buf)
 {
   long int val_return;
@@ -450 +450 @@
 }
 
-long int retry_aud_unlink (char * file, int line, 
+long int retry_aud_unlink (const char * file, int line, 
                            char * path)
 {
@@ -477 +477 @@
 }
 
-long int retry_aud_dup2 (char * file, int line, 
+long int retry_aud_dup2 (const char * file, int line, 
                          int fd, int fd2)
 {
@@ -504 +504 @@
 }
 
-long int retry_aud_dup (char * file, int line, 
+long int retry_aud_dup (const char * file, int line, 
                         int fd)
 {
@@ -532 +532 @@
 
   
-long int retry_aud_chdir (char * file, int line, 
+long int retry_aud_chdir (const char * file, int line, 
                           const char *path)
 {
@@ -560 +560 @@
 
 
-long int aud_open_noatime (char * file, int line, int privs,
+long int aud_open_noatime (const char * file, int line, int privs,
                            const char *pathname, int flags, mode_t mode,
                            int * o_noatime)
@@ -601 +601 @@
 }
 
-long int aud_open (char * file, int line, int privs,
+long int aud_open (const char * file, int line, int privs,
                    const char *pathname, int flags, mode_t mode)
 {
@@ -635 +635 @@
 }
   
-long int aud_kill (char * file, int line, pid_t pid, int sig)
+long int aud_kill (const char * file, int line, pid_t pid, int sig)
 {
   int  myerror;
@@ -657 +657 @@
   
 /*@noreturn@*/
-void aud_exit (char * file, int line, int fd)
+void aud_exit (const char * file, int line, int fd)
 {
   if (sh.flag.audit != 0 && (sh.flag.aud_mask & AUD_EXIT) != 0)
@@ -670 +670 @@
 
 /*@noreturn@*/
-void aud__exit (char * file, int line, int fd)
+void aud__exit (const char * file, int line, int fd)
 {
   if (sh.flag.audit != 0 && (sh.flag.aud_mask & AUD_EXIT) != 0)
@@ -682 +682 @@
 }
 
-pid_t aud_fork (char * file, int line)
+pid_t aud_fork (const char * file, int line)
 {
   int error;
@@ -703 +703 @@
 }
 
-int aud_setuid (char * file, int line, uid_t uid)
+int aud_setuid (const char * file, int line, uid_t uid)
 {
   int error = 0;
@@ -731 +731 @@
 }
 
-int aud_setgid (char * file, int line, gid_t gid)
+int aud_setgid (const char * file, int line, gid_t gid)
 {
   int error = 0;
@@ -760 +760 @@
 }
 
-int aud_pipe (char * file, int line, int * modus)
+int aud_pipe (const char * file, int line, int * modus)
 {
   int error;

trunk/src/sh_cat.c

@@ -8 +8 @@
 /*@-nullassign@*/
 
-char * class_cat[] = {
+const char * class_cat[] = {
   N_("AUD"),     /*  0 */
   N_("PANIC"),   /*  1 */
@@ -263 +263 @@
   { MSG_E_READ,      SH_ERR_ERR,     ERR,   N_("msg=\"Not accessible or not a regular file\" path=\"%s\"")},
   { MSG_E_TIMEOUT,   SH_ERR_ERR,     ERR,   N_("msg=\"Timeout (%d sec) while checksumming file\" path=\"%s\"")},
-  { MSG_NODEV,       SH_ERR_ERR,     ERR,   N_("msg=\"Device not available\" userid=\"%ld\" path=\"%s\"")},
+  { MSG_NODEV,       SH_ERR_ERR,     ERR,   N_("msg=\"Device not available or timeout during read attempt\" userid=\"%ld\" path=\"%s\"")},
   { MSG_LOCKED,      SH_ERR_ERR,     ERR,   N_("msg=\"File lock error\" userid=\"%ld\" path=\"%s\" obj=\"%s\"")},
   { MSG_PIDFILE,      SH_ERR_ERR,     ERR,   N_("msg=\"Could not write PID file\" userid=\"%ld\" path=\"%s\"")},
@@ -580 +580 @@
   { MSG_E_READ,      SH_ERR_ERR,     ERR,   N_("msg=<Not accessible or not a regular file>, path=<%s>")},
   { MSG_E_TIMEOUT,   SH_ERR_ERR,     ERR,   N_("msg=<Timeout (%d sec) while checksumming file>, path=<%s>")},
-  { MSG_NODEV,       SH_ERR_ERR,     ERR,   N_("msg=<Device not available>, userid=<%ld>, path=<%s>")},
+  { MSG_NODEV,       SH_ERR_ERR,     ERR,   N_("msg=<Device not available or timeout during read attempt>, userid=<%ld>, path=<%s>")},
   { MSG_LOCKED,      SH_ERR_ERR,     ERR,   N_("msg=<File lock error>, userid=<%ld>, path=<%s>, obj=<%s>")},
   { MSG_PIDFILE,      SH_ERR_ERR,     ERR,   N_("msg=<Could not write PID file>, userid=<%ld>, path=<%s>")},

trunk/src/sh_database.c

@@ -61 +61 @@
   char            msg[1024];
   char            sev[8];
-  char            path[12288];
+  char            path[MAX_PATH_STORE+1];
   char            user[9];
   char            group[9];
@@ -82 +82 @@
   char            interface[64];   
   char            ltime[64];   
-  char            dir[1024];   
-  char            linked_path[1024]; 
+  char            dir[MAX_PATH_STORE+1];   
+  char            linked_path[MAX_PATH_STORE+1]; 
   char            service[64];   
   char            facility[32];   
@@ -107 +107 @@
   char            chksum_old[50];
   char            chksum_new[50];
-  char            link_old[1024];
-  char            link_new[1024];
+  char            link_old[MAX_PATH_STORE+1];
+  char            link_new[MAX_PATH_STORE+1];
   char            acl_old[1024];
   char            acl_new[1024];
@@ -134 +134 @@
   { NULL, N_("msg"),         0,   4, 1024, 0, offsetof(struct dbins_, msg) },
 
-  { NULL, N_("path"),        0,   5,12288, 0, offsetof(struct dbins_, path)  },
+  { NULL, N_("path"),        0,   5,MAX_PATH_STORE+1, 0, offsetof(struct dbins_, path)  },
   /* username -> userid; replace (long) 'userid' - below - by 'dummy' */ 
   { NULL, N_("userid"),      0,   6,    9, 0, offsetof(struct dbins_, user)  },
@@ -155 +155 @@
   { NULL, N_("interface"),   0,  24,   64, 0, offsetof(struct dbins_, interface)},
   { NULL, N_("time"),        0,  25,   64, 0, offsetof(struct dbins_, ltime)  },
-  { NULL, N_("dir"),         0,  26, 1024, 0, offsetof(struct dbins_, dir)  },
-  { NULL, N_("linked_path"), 0,  27, 1024, 0, offsetof(struct dbins_, linked_path)},
+  { NULL, N_("dir"),         0,  26, MAX_PATH_STORE+1, 0, offsetof(struct dbins_, dir)  },
+  { NULL, N_("linked_path"), 0,  27, MAX_PATH_STORE+1, 0, offsetof(struct dbins_, linked_path)},
   { NULL, N_("service"),     0,  29,   64, 0, offsetof(struct dbins_, service)},
   { NULL, N_("facility"),    0,  30,   32, 0, offsetof(struct dbins_, facility) },
@@ -178 +178 @@
   { NULL, N_("chksum_old"),  0,  47,   50, 0, offsetof(struct dbins_, chksum_old)},
   { NULL, N_("chksum_new"),  0,  48,   50, 0, offsetof(struct dbins_, chksum_new)},
-  { NULL, N_("link_old"),    0,  49, 1024, 0, offsetof(struct dbins_, link_old)},
-  { NULL, N_("link_new"),    0,  50, 1024, 0, offsetof(struct dbins_, link_new)},
+  { NULL, N_("link_old"),    0,  49, MAX_PATH_STORE+1, 0, offsetof(struct dbins_, link_old)},
+  { NULL, N_("link_new"),    0,  50, MAX_PATH_STORE+1, 0, offsetof(struct dbins_, link_new)},
                                             
   { NULL, N_("size_old"),     0,  51,    0, 0, 0  },
@@ -1034 +1034 @@
 static int        connection_status = S_FALSE;
 
-void sh_database_reset()
+void sh_database_reset(void)
 {
   connection_status = S_FALSE;
@@ -1226 +1226 @@
 }
 
-#define SH_QUERY_MAX 16383
+#define SH_QUERY_MAX SH_MSG_BUF
+/* define SH_QUERY_MAX 16383 */
 
 static
@@ -1450 +1451 @@
 static int sh_database_comp_attr (const void *m1, const void *m2) 
 {
-  my_attr *mi1 = (my_attr *) m1;
-  my_attr *mi2 = (my_attr *) m2;
+  const my_attr *mi1 = (const my_attr *) m1;
+  const my_attr *mi2 = (const my_attr *) m2;
   return strcmp(mi1->attr, mi2->attr);
 }
 
 
-static void init_attr_table()
+static void init_attr_table(void)
 {
   static  int first = S_TRUE;

trunk/src/sh_entropy.c

@@ -281 +281 @@
 #include "sh_pthread.h"
 
-int read_mbytes(int timeout_val, char * path, char * nbuf, int nbytes)
+int read_mbytes(int timeout_val, const char * path, char * nbuf, int nbytes)
 {
   int m_count;

trunk/src/sh_err_console.c

@@ -127 +127 @@
 #define MY_MAX_MSG    1022
 
-static int push_message_queue (char * msg)
+static int push_message_queue (const char * msg)
 {
   struct sh_msgbuf*   recv_msg = NULL;
@@ -258 +258 @@
 
 #if defined(WITH_TRACE) || defined(WITH_TPT)
-char *  sh_log_console_name ()
+char *  sh_log_console_name (void)
 {
   if (! sh.srvcons.name || sh.srvcons.name[0] == '\0' ||
@@ -273 +273 @@
 /* ---- Print out a message. ----
  */
-int  sh_log_console (/*@null@*/char *errmsg)
+int  sh_log_console (const /*@null@*/char *errmsg)
 {
   static int service_failure[2] = { 0, 0};

trunk/src/sh_err_log.c

@@ -184 +184 @@
 #endif
 
-  buf  = (char *) SH_ALLOC( 2*SH_BUFSIZE+1 );
-  bufc = (char *) SH_ALLOC( 2*SH_BUFSIZE+1 );
+  buf  = (char *) SH_ALLOC( 2*SH_MSG_BUF+1 );
+  bufc = (char *) SH_ALLOC( 2*SH_MSG_BUF+1 );
 
   while (1 == 1) 
@@ -191 +191 @@
       /* get the log message
        */
-      if (sh_unix_getline (fd, buf, (2*SH_BUFSIZE)) < 0) 
+      if (sh_unix_getline (fd, buf, (2*SH_MSG_BUF)) < 0) 
         break;
 
@@ -222 +222 @@
           start = 1;
           do {
-            if ( sh_unix_getline (fd, buf, (2*SH_BUFSIZE)) < 0)
+            if ( sh_unix_getline (fd, buf, (2*SH_MSG_BUF)) < 0)
               break;
           } while (buf[0] == '\0' || buf[0] == '\n');
@@ -293 +293 @@
         {
           do {
-            if ( sh_unix_getline (fd, bufc, (2*SH_BUFSIZE)) < 0)
+            if ( sh_unix_getline (fd, bufc, (2*SH_MSG_BUF)) < 0)
               break;
           } while (bufc[0] == '\0' || bufc[0] == '\n');
@@ -301 +301 @@
               /* A continuation line. Add the newline. 
                */
-              (void) sl_strlcat(buf, "\n", 2*SH_BUFSIZE+1);
+              (void) sl_strlcat(buf, "\n", 2*SH_MSG_BUF+1);
               ++len;
-              (void) sl_strlcat(buf, bufc, 2*SH_BUFSIZE+1);
+              (void) sl_strlcat(buf, bufc, 2*SH_MSG_BUF+1);
               len += (int) sl_strlen(bufc);
             }
@@ -437 +437 @@
         }
       
-      (void) sl_strlcat ( buf, key, 2*SH_BUFSIZE + 1);
+      (void) sl_strlcat ( buf, key, 2*SH_MSG_BUF + 1);
       
 #ifdef SH_STEALTH

trunk/src/sh_err_syslog.c

@@ -31 +31 @@
 
 typedef struct log_fac_struct {
-  char * name;
+  const char * name;
   int    facility;
 } logfct;

trunk/src/sh_error.c

@@ -105 +105 @@
 static int sh_error_string (struct _log_t * lmsg, va_list vl);
 
-extern int  sh_log_console (/*@null@*/char *message);
+extern int  sh_log_console (/*@null@*/const char *message);
 extern int  sh_log_syslog  (int  severity, /*@null@*/char *message);
 extern int  sh_log_file    (/*@null@*/char *message, 
@@ -173 +173 @@
 
 static
-void compute_flag_err_debug()
+void compute_flag_err_debug(void)
 {
   if ((errFlags.loglevel & SH_ERR_ALL) != 0)
@@ -197 +197 @@
 
 static
-void compute_flag_err_info()
+void compute_flag_err_info(void)
 {
   if ((errFlags.loglevel & SH_ERR_INFO) != 0)
@@ -220 +220 @@
 }
 
-void sh_error_dbg_switch()
+void sh_error_dbg_switch(void)
 {
   if (dbg_flag == 0)
@@ -466 +466 @@
 typedef struct eef 
 {
-  char * str;
+  const char * str;
   int    val;
 } eef_struc;
@@ -797 +797 @@
 /* init or re-init log facilities that need it
  */
-void sh_error_fixup()
+void sh_error_fixup(void)
 {
 #if defined(HAVE_LIBPRELUDE_9)
@@ -813 +813 @@
 /* to be called from sh_prelude_reset
  */
-void sh_error_init_prelude()
+void sh_error_init_prelude(void)
 {
 #if defined(HAVE_LIBPRELUDE_9)
@@ -865 +865 @@
 SH_MUTEX_RECURSIVE(mutex_err_handle);
 
-void sh_error_handle (int sev, char * file, long line, 
+void sh_error_handle (int sev, const char * file, long line, 
                       long status, unsigned long msg_id, ...)
 {
@@ -875 +875 @@
   char * fmt;
 
-  int    flag_inet  = S_FALSE;
+  int    flag_inet;
 
 #ifdef SH_WITH_SERVER
@@ -974 +974 @@
     {
       flag_inet = S_TRUE;
+    }
+  else
+    {
+      flag_inet  = S_FALSE;
     }
 
@@ -1355 +1359 @@
           *priority = (int) msg_cat[i].priority;
           *class    = (unsigned int) msg_cat[i].class;
-          SL_RETURN (_(msg_cat[i].format), _("get_format"));
+          SL_RETURN (((char *) _(msg_cat[i].format)), _("get_format"));
         }
       ++i;
@@ -1545 +1549 @@
       /*@i@*/required = sl_vsnprintf(&(lmsg->msg[len]), 
                                      (lmsg->msg_len - len), lmsg->format, vl);
+
       if ((required >= 0) && 
           sl_ok_adds(required, len) &&
@@ -1556 +1561 @@
           lmsg->msg_len = required + len + 4;
           (void) sl_vsnprintf(&(lmsg->msg[len]), 
-                              (required + len + 1), lmsg->format, vl2);
+                              (required + 1), lmsg->format, vl2);
         }
       va_end(vl2);

trunk/src/sh_extern.c

@@ -825 +825 @@
   if (!ext_com)
     {
-      SL_RETURN( NULL, ("command_init"));
+      SL_RETURN( NULL, _("command_init"));
     }
 
@@ -853 +853 @@
   ext_com->next             = NULL;
 
-  SL_RETURN( ext_com, ("command_init"));
+  SL_RETURN( ext_com, _("command_init"));
 }
 
@@ -1170 +1170 @@
   if (ext_coms == NULL || ext_failed == (-1) || str == NULL)
     {
-      SL_RETURN (-1, ("sh_ext_deadtime"));
+      SL_RETURN (-1, _("sh_ext_deadtime"));
     }
   deadtime = strtol(str, &tail, 10);
   if (tail == str || deadtime < 0 || deadtime == LONG_MAX)
     {
-      SL_RETURN (-1, ("sh_ext_deadtime"));
+      SL_RETURN (-1, _("sh_ext_deadtime"));
     }
   
   ext_coms->deadtime = (time_t) deadtime;  
-  SL_RETURN (0, ("sh_ext_deadtime"));  
+  SL_RETURN (0, _("sh_ext_deadtime"));  
 }
 

trunk/src/sh_files.c

@@ -1482 +1482 @@
                               char * relativeName)
 {
-  struct sh_dirent * dirlist = NULL;
-  struct sh_dirent * dirlist_orig = NULL;
+  struct sh_dirent * dirlist;
+  struct sh_dirent * dirlist_orig;
 
   DIR *           thisDir = NULL;
@@ -1646 +1646 @@
    */
   SH_MUTEX_LOCK(mutex_readdir);
+
+  dirlist = NULL;
+  dirlist_orig = NULL;
 
   do {
@@ -2273 +2276 @@
 }
 
-extern void     aud_exit   (char * file, int line, int fd);
+extern void     aud_exit   (const char * file, int line, int fd);
       
 int sh_files_test_setup ()

trunk/src/sh_forward.c

@@ -2220 +2220 @@
 /* -- Mark all clients as dead.
  */
-void sh_forward_mark_dead ()
+void sh_forward_mark_dead (void)
 {
   zAVLCursor avlcursor;
@@ -2238 +2238 @@
 /* -- Clean tree from dead clients.
  */
-void sh_forward_clean_tree ()
+void sh_forward_clean_tree (void)
 {
   zAVLCursor avlcursor;
@@ -2499 +2499 @@
 /* -- Check for time limit exceeded. --
  */
-static int client_time_check()
+static int client_time_check(void)
 {
   zAVLCursor avlcursor;
@@ -4814 +4814 @@
 static int sh_tcp_sock = -1;
 
-int sh_create_tcp_socket ()
+int sh_create_tcp_socket (void)
 {
   struct sockaddr_in addr;
@@ -5382 +5382 @@
 }
 
-void  free_client_tree ()
+void  free_client_tree (void)
 {
   SL_ENTER(_("free_client_tree"));

trunk/src/sh_getopt.c

@@ -52 +52 @@
 
 typedef struct options {
-  char * longopt;
+  const char * longopt;
   const char   shortopt;
-  char * usage;
+  const char * usage;
   int          hasArg;
   int (*func)(const char * opt);
@@ -313 +313 @@
 
 
-static void sh_getopt_print_log_facilities ()
+static void sh_getopt_print_log_facilities (void)
 {
   fputs (_("Compiled-in log facilities:"), stdout);
@@ -372 +372 @@
 }
 
-static void sh_getopt_print_options ()
+static void sh_getopt_print_options (void)
 {
   int num = 0;
@@ -484 +484 @@
 }
 
-static void sh_getopt_print_modules ()
+static void sh_getopt_print_modules (void)
 {
 #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
@@ -686 +686 @@
 static int sh_getopt_forever (const char * dummy)
 {
-  dummy = (void *) dummy;
+  (void) dummy;
   SL_ENTER(_("sh_getopt_forever"));
   sh.flag.loop = S_TRUE;

trunk/src/sh_gpg.c

@@ -214 +214 @@
 static struct startup_info startInfo = { 0, NULL, 0, NULL, NULL, NULL };
 
-void sh_gpg_log_startup ()
+void sh_gpg_log_startup (void)
 {
   if (startInfo.program != NULL)

trunk/src/sh_hash.c

@@ -246 +246 @@
 
 
-/* MAX_PATH_STORE must be >= KEY_LEN
- */
-#define MAX_PATH_STORE 12287
-
 typedef struct store_info {
 
@@ -294 +290 @@
 } sh_file_t;
 
-  static char  *policy[] = {
+  static const char  *policy[] = {
     N_("[]"),
     N_("[ReadOnly]"),
@@ -426 +422 @@
   char * str;
   char hashbuf[KEYBUF_SIZE];
-  int  retval = 0;
+  int  retval;
 
   /* --------  find the entry for the file ----------------       */
 
   SH_MUTEX_LOCK(mutex_hash);
+
+  retval = 0;
 
   if (sl_strlen(fullpath) <= MAX_PATH_STORE) 
@@ -786 +784 @@
 }
 
-static void sh_hash_getline_end ()
+static void sh_hash_getline_end (void)
 {
   fclose (sh_fin_fd);
@@ -1123 +1121 @@
 
   sh_file_t * p;
-  SL_TICKET fd    = (-1);
+  SL_TICKET fd;
   long i;
   int count = 0;
@@ -1134 +1132 @@
   char * buf  = NULL;
   int    bufc;
-  int    flag_pgp = S_FALSE;
-  int    flag_nohead = S_FALSE;
+  int    flag_pgp;
+  int    flag_nohead;
   SL_TICKET fdTmp = (-1);
   SL_TICKET open_tmp (void);
@@ -1144 +1142 @@
 
   SH_MUTEX_LOCK(mutex_hash);
+
+#if defined(WITH_GPG) || defined(WITH_PGP)
+  flag_pgp = S_FALSE;
+  flag_nohead = S_FALSE;
+#endif
 
   if (IsInit == 1)
@@ -1149 +1152 @@
       goto unlock_and_return;
     }
+
+  fd = (-1);
 
 #if defined(SH_WITH_CLIENT)
@@ -1308 +1313 @@
   /* } new 1.4.8 check sig also for files downloaded from server */
 
-  line = SH_ALLOC(MAX_PATH_STORE+1);
+  line = SH_ALLOC(MAX_PATH_STORE+2);
 
   /* fast forward to start of data
    */
-  sh_hash_setdataent(fd, line, MAX_PATH_STORE, file_path('D', 'R'));
+  sh_hash_setdataent(fd, line, MAX_PATH_STORE+1, file_path('D', 'R'));
 
   for (i = 0; i < TABSIZE; ++i) 
@@ -1326 +1331 @@
         }
 
-      p = sh_hash_getdataent (fd, line, MAX_PATH_STORE);
+      p = sh_hash_getdataent (fd, line, MAX_PATH_STORE+1);
       if (p != NULL)
         {
@@ -1922 +1927 @@
 {
   sh_file_t * p;
-  int retval = 0;
+  int retval;
 
   if (IsInit != 1) 
@@ -1928 +1933 @@
 
   SH_MUTEX_LOCK(mutex_hash);
+
+  retval = 0;
+
   p = sh_hash_have_it_int (newname);
 
@@ -1944 +1952 @@
 {
   sh_file_t * p;
-  int retval = -1;
+  int retval;
 
   if (IsInit != 1) 
@@ -1953 +1961 @@
 
   SH_MUTEX_LOCK(mutex_hash);
+
+  retval = (-1);
+
   p = sh_hash_have_it_int (newname);
   if (p)
@@ -1973 +1984 @@
 {
   sh_file_t * p;
-  int retval = -1;
+  int retval;
 
   if (IsInit != 1) 
@@ -1982 +1993 @@
   if (p)
     retval = p->fflags;
+  else
+    retval = -1;
   SH_MUTEX_UNLOCK(mutex_hash);
   return retval;
@@ -1989 +2002 @@
 {
   sh_file_t * p;
-  int retval = -1;
+  int retval;
 
   if (IsInit != 1) 
@@ -2001 +2014 @@
       retval = 0;
     }
+  else
+    retval = -1;
   SH_MUTEX_UNLOCK(mutex_hash);
   return retval;
@@ -2035 +2050 @@
   sh_file_t * p;
   char hashbuf[KEYBUF_SIZE];
-  int  retval = -1;
+  int  retval;
 
   SL_ENTER(_("sh_hash_set_visited_int"));
@@ -2072 +2087 @@
       retval = 0;
     }
+  else
+    retval = -1;
 
   SH_MUTEX_UNLOCK(mutex_hash);
@@ -2373 +2390 @@
   char * format;
 
-  char * tmp = SH_ALLOC(SH_BUFSIZE);
-  char * msg = SH_ALLOC(SH_BUFSIZE);
+  char * tmp = SH_ALLOC(SH_MSG_BUF);
+  char * msg = SH_ALLOC(SH_MSG_BUF);
 
   tmp[0] = '\0';
@@ -2385 +2402 @@
   else 
     format = _("mode_old=\"%s\" attr_old=\"%s\" imode_old=\"%ld\" iattr_old=\"%ld\" ");
-  sl_snprintf(tmp, SH_BUFSIZE, format,
+  sl_snprintf(tmp, SH_MSG_BUF, format,
               theFile->c_mode,
               theFile->c_attributes,
@@ -2397 +2414 @@
     format = _("mode_old=\"%s\" imode_old=\"%ld\" ");
 
-  sl_snprintf(tmp, SH_BUFSIZE, format,
+  sl_snprintf(tmp, SH_MSG_BUF, format,
               theFile->c_mode,
               (long) theFile->mode
               );
 #endif
-  sl_strlcat(msg, tmp, SH_BUFSIZE);
+  sl_strlcat(msg, tmp, SH_MSG_BUF);
 
   if (is_new)
@@ -2408 +2425 @@
   else
     format = _("hardlinks_old=\"%lu\" ");
-  sl_snprintf(tmp, SH_BUFSIZE, format,
+  sl_snprintf(tmp, SH_MSG_BUF, format,
               (unsigned long) theFile->hardlinks);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
 
@@ -2417 +2434 @@
   else
     format = _("idevice_old=\"%lu\" ");
-  sl_snprintf(tmp, SH_BUFSIZE, format, (unsigned long) theFile->rdev);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+  sl_snprintf(tmp, SH_MSG_BUF, format, (unsigned long) theFile->rdev);
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
 
@@ -2425 +2442 @@
   else
     format = _("inode_old=\"%lu\" ");
-  sl_snprintf(tmp, SH_BUFSIZE, format, (unsigned long) theFile->ino);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+  sl_snprintf(tmp, SH_MSG_BUF, format, (unsigned long) theFile->ino);
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
   /* 
@@ -2436 +2453 @@
   else
     format = _("dev_old=\"%lu,%lu\" ");
-  sl_snprintf(tmp, SH_BUFSIZE, format,                
+  sl_snprintf(tmp, SH_MSG_BUF, format,                
               (unsigned long) major(theFile->dev),
               (unsigned long) minor(theFile->dev));
-  sl_strlcat(msg, tmp, SH_BUFSIZE);
+  sl_strlcat(msg, tmp, SH_MSG_BUF);
 #endif
 
@@ -2447 +2464 @@
   else
     format = _("owner_old=\"%s\" iowner_old=\"%ld\" ");
-  sl_snprintf(tmp, SH_BUFSIZE, format,
+  sl_snprintf(tmp, SH_MSG_BUF, format,
               theFile->c_owner, (long) theFile->owner);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
 
@@ -2456 +2473 @@
   else
     format = _("group_old=\"%s\" igroup_old=\"%ld\" ");
-  sl_snprintf(tmp, SH_BUFSIZE, format,
+  sl_snprintf(tmp, SH_MSG_BUF, format,
               theFile->c_group, (long) theFile->group);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
 
   if (is_new)
-    sl_snprintf(tmp, SH_BUFSIZE, sh_hash_size_format(),
+    sl_snprintf(tmp, SH_MSG_BUF, sh_hash_size_format(),
                 (UINT64) 0, (UINT64) theFile->size);
   else
-    sl_snprintf(tmp, SH_BUFSIZE, sh_hash_size_format(),
+    sl_snprintf(tmp, SH_MSG_BUF, sh_hash_size_format(),
                 (UINT64) theFile->size, (UINT64) 0);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
 
   (void) sh_unix_gmttime (theFile->ctime, timstr1c,  sizeof(timstr1c));
   if (is_new)
-    sl_snprintf(tmp, SH_BUFSIZE, _("ctime_new=\"%s\" "), timstr1c);
-  else
-    sl_snprintf(tmp, SH_BUFSIZE, _("ctime_old=\"%s\" "), timstr1c);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+    sl_snprintf(tmp, SH_MSG_BUF, _("ctime_new=\"%s\" "), timstr1c);
+  else
+    sl_snprintf(tmp, SH_MSG_BUF, _("ctime_old=\"%s\" "), timstr1c);
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
   (void) sh_unix_gmttime (theFile->atime, timstr1a,  sizeof(timstr1a));
   if (is_new)
-    sl_snprintf(tmp, SH_BUFSIZE, _("atime_new=\"%s\" "), timstr1a);
-  else
-    sl_snprintf(tmp, SH_BUFSIZE, _("atime_old=\"%s\" "), timstr1a);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+    sl_snprintf(tmp, SH_MSG_BUF, _("atime_new=\"%s\" "), timstr1a);
+  else
+    sl_snprintf(tmp, SH_MSG_BUF, _("atime_old=\"%s\" "), timstr1a);
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
   (void) sh_unix_gmttime (theFile->mtime, timstr1m,  sizeof(timstr1m));
   if (is_new)
-    sl_snprintf(tmp, SH_BUFSIZE, _("mtime_new=\"%s\" "), timstr1m);
-  else
-    sl_snprintf(tmp, SH_BUFSIZE, _("mtime_old=\"%s\" "), timstr1m);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+    sl_snprintf(tmp, SH_MSG_BUF, _("mtime_new=\"%s\" "), timstr1m);
+  else
+    sl_snprintf(tmp, SH_MSG_BUF, _("mtime_old=\"%s\" "), timstr1m);
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
   if (is_new)
-    sl_snprintf(tmp, SH_BUFSIZE, _("chksum_new=\"%s\" "), fileHash);
-  else
-    sl_snprintf(tmp, SH_BUFSIZE, _("chksum_old=\"%s\" "), fileHash);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+    sl_snprintf(tmp, SH_MSG_BUF, _("chksum_new=\"%s\" "), fileHash);
+  else
+    sl_snprintf(tmp, SH_MSG_BUF, _("chksum_old=\"%s\" "), fileHash);
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
   if (theFile->c_mode[0] == 'l' || 
@@ -2504 +2521 @@
         {
           if (is_new)
-            sl_snprintf(tmp, SH_BUFSIZE, _("link_new=\"%s\" "), tmp_lnk);
+            sl_snprintf(tmp, SH_MSG_BUF, _("link_new=\"%s\" "), tmp_lnk);
           else
-            sl_snprintf(tmp, SH_BUFSIZE, _("link_old=\"%s\" "), tmp_lnk);
+            sl_snprintf(tmp, SH_MSG_BUF, _("link_old=\"%s\" "), tmp_lnk);
           SH_FREE(tmp_lnk);
-          sl_strlcat(msg, tmp, SH_BUFSIZE);
+          sl_strlcat(msg, tmp, SH_MSG_BUF);
         } 
     }
@@ -2518 +2535 @@
         {
           if (is_new)
-            sl_snprintf(tmp, SH_BUFSIZE, _("acl_new=\"%s\" "), tmp_lnk);
+            sl_snprintf(tmp, SH_MSG_BUF, _("acl_new=\"%s\" "), tmp_lnk);
           else
-            sl_snprintf(tmp, SH_BUFSIZE, _("acl_old=\"%s\" "), tmp_lnk);
+            sl_snprintf(tmp, SH_MSG_BUF, _("acl_old=\"%s\" "), tmp_lnk);
           SH_FREE(tmp_lnk);
-          sl_strlcat(msg, tmp, SH_BUFSIZE);
+          sl_strlcat(msg, tmp, SH_MSG_BUF);
         } 
     }
@@ -2540 +2557 @@
   char * format;
 
-  char * tmp = SH_ALLOC(SH_BUFSIZE);
-  char * msg = SH_ALLOC(SH_BUFSIZE);
+  char * tmp = SH_ALLOC(SH_MSG_BUF);
+  char * msg = SH_ALLOC(SH_MSG_BUF);
 
   tmp[0] = '\0';
@@ -2552 +2569 @@
   else 
     format = _("mode_old=<%s>, attr_old=<%s>, imode_old=<%ld>, iattr_old=<%ld>, ");
-  sl_snprintf(tmp, SH_BUFSIZE, format,
+  sl_snprintf(tmp, SH_MSG_BUF, format,
               theFile->c_mode,
               theFile->c_attributes,
@@ -2564 +2581 @@
     format = _("mode_old=<%s>, imode_old=<%ld>, ");
 
-  sl_snprintf(tmp, SH_BUFSIZE, format,
+  sl_snprintf(tmp, SH_MSG_BUF, format,
               theFile->c_mode,
               (long) theFile->mode
               );
 #endif
-  sl_strlcat(msg, tmp, SH_BUFSIZE);
+  sl_strlcat(msg, tmp, SH_MSG_BUF);
 
   if (is_new)
@@ -2575 +2592 @@
   else
     format = _("hardlinks_old=<%lu>, ");
-  sl_snprintf(tmp, SH_BUFSIZE, format,
+  sl_snprintf(tmp, SH_MSG_BUF, format,
               (unsigned long) theFile->hardlinks);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
 
@@ -2584 +2601 @@
   else
     format = _("idevice_old=<%lu>, ");
-  sl_snprintf(tmp, SH_BUFSIZE, format, (unsigned long) theFile->rdev);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+  sl_snprintf(tmp, SH_MSG_BUF, format, (unsigned long) theFile->rdev);
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
 
@@ -2592 +2609 @@
   else
     format = _("inode_old=<%lu>, ");
-  sl_snprintf(tmp, SH_BUFSIZE, format, (unsigned long) theFile->ino);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+  sl_snprintf(tmp, SH_MSG_BUF, format, (unsigned long) theFile->ino);
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
 
@@ -2604 +2621 @@
   else
     format = _("dev_old=<%lu,%lu>, ");
-  sl_snprintf(tmp, SH_BUFSIZE, format,                
+  sl_snprintf(tmp, SH_MSG_BUF, format,                
               (unsigned long) major(theFile->dev),
               (unsigned long) minor(theFile->dev));
-  sl_strlcat(msg, tmp, SH_BUFSIZE);
+  sl_strlcat(msg, tmp, SH_MSG_BUF);
 #endif
 
@@ -2614 +2631 @@
   else
     format = _("owner_old=<%s>, iowner_old=<%ld>, ");
-  sl_snprintf(tmp, SH_BUFSIZE, format,
+  sl_snprintf(tmp, SH_MSG_BUF, format,
               theFile->c_owner, (long) theFile->owner);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
 
@@ -2623 +2640 @@
   else
     format = _("group_old=<%s>, igroup_old=<%ld>, ");
-  sl_snprintf(tmp, SH_BUFSIZE, format,
+  sl_snprintf(tmp, SH_MSG_BUF, format,
               theFile->c_group, (long) theFile->group);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
 
   if (is_new)
-    sl_snprintf(tmp, SH_BUFSIZE, sh_hash_size_format(),
+    sl_snprintf(tmp, SH_MSG_BUF, sh_hash_size_format(),
                 (UINT64) 0, (UINT64) theFile->size);
   else
-    sl_snprintf(tmp, SH_BUFSIZE, sh_hash_size_format(),
+    sl_snprintf(tmp, SH_MSG_BUF, sh_hash_size_format(),
                 (UINT64) theFile->size, (UINT64) 0);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
 
   (void) sh_unix_gmttime (theFile->ctime, timstr1c,  sizeof(timstr1c));
   if (is_new)
-    sl_snprintf(tmp, SH_BUFSIZE, _("ctime_new=<%s>, "), timstr1c);
-  else
-    sl_snprintf(tmp, SH_BUFSIZE, _("ctime_old=<%s>, "), timstr1c);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+    sl_snprintf(tmp, SH_MSG_BUF, _("ctime_new=<%s>, "), timstr1c);
+  else
+    sl_snprintf(tmp, SH_MSG_BUF, _("ctime_old=<%s>, "), timstr1c);
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
   (void) sh_unix_gmttime (theFile->atime, timstr1a,  sizeof(timstr1a));
   if (is_new)
-    sl_snprintf(tmp, SH_BUFSIZE, _("atime_new=<%s>, "), timstr1a);
-  else
-    sl_snprintf(tmp, SH_BUFSIZE, _("atime_old=<%s>, "), timstr1a);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+    sl_snprintf(tmp, SH_MSG_BUF, _("atime_new=<%s>, "), timstr1a);
+  else
+    sl_snprintf(tmp, SH_MSG_BUF, _("atime_old=<%s>, "), timstr1a);
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
   (void) sh_unix_gmttime (theFile->mtime, timstr1m,  sizeof(timstr1m));
   if (is_new)
-    sl_snprintf(tmp, SH_BUFSIZE, _("mtime_new=<%s>, "), timstr1m);
-  else
-    sl_snprintf(tmp, SH_BUFSIZE, _("mtime_old=<%s>, "), timstr1m);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+    sl_snprintf(tmp, SH_MSG_BUF, _("mtime_new=<%s>, "), timstr1m);
+  else
+    sl_snprintf(tmp, SH_MSG_BUF, _("mtime_old=<%s>, "), timstr1m);
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
   if (is_new)
-    sl_snprintf(tmp, SH_BUFSIZE, _("chksum_new=<%s>"), fileHash);
-  else
-    sl_snprintf(tmp, SH_BUFSIZE, _("chksum_old=<%s>"), fileHash);
-  sl_strlcat(msg, tmp, SH_BUFSIZE); 
+    sl_snprintf(tmp, SH_MSG_BUF, _("chksum_new=<%s>"), fileHash);
+  else
+    sl_snprintf(tmp, SH_MSG_BUF, _("chksum_old=<%s>"), fileHash);
+  sl_strlcat(msg, tmp, SH_MSG_BUF); 
 
   if (theFile->c_mode[0] == 'l' || 
@@ -2671 +2688 @@
         {
           if (is_new)
-            sl_snprintf(tmp, SH_BUFSIZE, _(", link_new=<%s> "), tmp_lnk);
+            sl_snprintf(tmp, SH_MSG_BUF, _(", link_new=<%s> "), tmp_lnk);
           else
-            sl_snprintf(tmp, SH_BUFSIZE, _(", link_old=<%s> "), tmp_lnk);
+            sl_snprintf(tmp, SH_MSG_BUF, _(", link_old=<%s> "), tmp_lnk);
           SH_FREE(tmp_lnk);
-          sl_strlcat(msg, tmp, SH_BUFSIZE);
+          sl_strlcat(msg, tmp, SH_MSG_BUF);
         } 
     }
@@ -2685 +2702 @@
         {
           if (is_new)
-            sl_snprintf(tmp, SH_BUFSIZE, _(", acl_new=<%s> "), tmp_lnk);
+            sl_snprintf(tmp, SH_MSG_BUF, _(", acl_new=<%s> "), tmp_lnk);
           else
-            sl_snprintf(tmp, SH_BUFSIZE, _(", acl_old=<%s> "), tmp_lnk);
+            sl_snprintf(tmp, SH_MSG_BUF, _(", acl_old=<%s> "), tmp_lnk);
           SH_FREE(tmp_lnk);
-          sl_strlcat(msg, tmp, SH_BUFSIZE);
+          sl_strlcat(msg, tmp, SH_MSG_BUF);
         } 
     }
@@ -2747 +2764 @@
   int  i;
 
-  unsigned long modi_mask = 0;
+  unsigned long modi_mask;
 
   char log_policy[32];
@@ -2753 +2770 @@
   char hashbuf[KEYBUF_SIZE];
 
-  int  retval = 0;
+  int  retval;
 
   SL_ENTER(_("sh_hash_compdata"));
@@ -2770 +2787 @@
 
   SH_MUTEX_LOCK(mutex_hash);
+
+  modi_mask = 0;
+  retval    = 0;
 
   if (sl_strlen(theFile->fullpath) <= MAX_PATH_STORE) 
@@ -3044 +3064 @@
   if (modi_mask != 0 && (!SH_FFLAG_REPORTED_SET(p->fflags)))
     { 
-      tmp = SH_ALLOC(SH_BUFSIZE);
-      msg = SH_ALLOC(SH_BUFSIZE);
+      tmp = SH_ALLOC(SH_MSG_BUF);
+      msg = SH_ALLOC(SH_MSG_BUF);
       msg[0] = '\0';
 
@@ -3056 +3076 @@
         {
 #if defined(__linux__) || defined(HAVE_STAT_FLAGS)
-          sl_snprintf(tmp, SH_BUFSIZE, 
+          sl_snprintf(tmp, SH_MSG_BUF, 
 #ifdef SH_USE_XML
                       _("mode_old=\"%s\" mode_new=\"%s\" attr_old=\"%s\" attr_new=\"%s\" imode_old=\"%ld\" imode_new=\"%ld\" iattr_old=\"%ld\" iattr_new=\"%ld\" "),
@@ -3072 +3092 @@
 #else
 #ifdef SH_USE_XML
-          sl_snprintf(tmp, SH_BUFSIZE, 
+          sl_snprintf(tmp, SH_MSG_BUF, 
                       _("mode_old=\"%s\" mode_new=\"%s\" imode_old=\"%ld\" imode_new=\"%ld\" "),
                       p->theFile.c_mode, theFile->c_mode,
                       (long) p->theFile.mode, (long) theFile->mode);
 #else
-          sl_snprintf(tmp, SH_BUFSIZE, _("mode_old=<%s>, mode_new=<%s>, "),
+          sl_snprintf(tmp, SH_MSG_BUF, _("mode_old=<%s>, mode_new=<%s>, "),
                       p->theFile.c_mode, theFile->c_mode);
 #endif
 #endif
-          sl_strlcat(msg, tmp, SH_BUFSIZE);
+          sl_strlcat(msg, tmp, SH_MSG_BUF);
 
 #if defined(USE_ACL) || defined(USE_XATTR)
           if (theFile->attr_string != NULL || p->attr_string != NULL)
             {
-              sl_snprintf(tmp, SH_BUFSIZE, 
+              sl_snprintf(tmp, SH_MSG_BUF, 
 #ifdef SH_USE_XML
                           _("acl_old=\"%s\" acl_new=\"%s\" "),
@@ -3095 +3115 @@
                           (theFile->attr_string) ? theFile->attr_string : _("none"));
               
-              sl_strlcat(msg, tmp, SH_BUFSIZE);
+              sl_strlcat(msg, tmp, SH_MSG_BUF);
             }
 #endif
@@ -3135 +3155 @@
       if ((modi_mask & MODI_HLN) != 0)
         {
-          sl_snprintf(tmp, SH_BUFSIZE, 
+          sl_snprintf(tmp, SH_MSG_BUF, 
 #ifdef SH_USE_XML
                       _("hardlinks_old=\"%lu\" hardlinks_new=\"%lu\" "),
@@ -3143 +3163 @@
                       (unsigned long) p->theFile.hardlinks, 
                       (unsigned long) theFile->hardlinks);
-          sl_strlcat(msg, tmp, SH_BUFSIZE); 
+          sl_strlcat(msg, tmp, SH_MSG_BUF); 
 #ifdef REPLACE_OLD
           if (sh.flag.reportonce == S_TRUE && sh.flag.update == S_FALSE)
@@ -3152 +3172 @@
       if ((modi_mask & MODI_RDEV) != 0)
         {
-          sl_snprintf(tmp, SH_BUFSIZE,
+          sl_snprintf(tmp, SH_MSG_BUF,
 #ifdef SH_USE_XML 
                       _("device_old=\"%lu,%lu\" device_new=\"%lu,%lu\" idevice_old=\"%lu\" idevice_new=\"%lu\" "),
@@ -3167 +3187 @@
 #endif
                       );
-          sl_strlcat(msg, tmp, SH_BUFSIZE); 
+          sl_strlcat(msg, tmp, SH_MSG_BUF); 
 #ifdef REPLACE_OLD
           if (sh.flag.reportonce == S_TRUE && sh.flag.update == S_FALSE)
@@ -3176 +3196 @@
       if ((modi_mask & MODI_INO) != 0)
         {
-          sl_snprintf(tmp, SH_BUFSIZE,
+          sl_snprintf(tmp, SH_MSG_BUF,
 #ifdef SH_USE_XML 
                       _("inode_old=\"%lu\" inode_new=\"%lu\" "),
@@ -3184 +3204 @@
                       (unsigned long) p->theFile.ino, 
                       (unsigned long) theFile->ino);
-          sl_strlcat(msg, tmp, SH_BUFSIZE); 
+          sl_strlcat(msg, tmp, SH_MSG_BUF); 
 #ifdef REPLACE_OLD
           if (sh.flag.reportonce == S_TRUE && sh.flag.update == S_FALSE)
@@ -3201 +3221 @@
       if ((modi_mask & MODI_INO) != 0)
         {
-          sl_snprintf(tmp, SH_BUFSIZE,
+          sl_snprintf(tmp, SH_MSG_BUF,
 #ifdef SH_USE_XML 
                       _("dev_old=\"%lu,%lu\" dev_new=\"%lu,%lu\" "),
@@ -3212 +3232 @@
                       (unsigned long) minor(theFile->dev)
                       );
-          sl_strlcat(msg, tmp, SH_BUFSIZE); 
+          sl_strlcat(msg, tmp, SH_MSG_BUF); 
 #ifdef REPLACE_OLD
           if (sh.flag.reportonce == S_TRUE && sh.flag.update == S_FALSE)
@@ -3227 +3247 @@
         {
 #ifdef SH_USE_XML
-          sl_snprintf(tmp, SH_BUFSIZE, 
+          sl_snprintf(tmp, SH_MSG_BUF, 
                       _("owner_old=\"%s\" owner_new=\"%s\" iowner_old=\"%ld\" iowner_new=\"%ld\" "),
 #else
-          sl_snprintf(tmp, SH_BUFSIZE, 
+          sl_snprintf(tmp, SH_MSG_BUF, 
                       _("owner_old=<%s>, owner_new=<%s>, iowner_old=<%ld>, iowner_new=<%ld>, "),
 #endif
@@ -3236 +3256 @@
                       (long) p->theFile.owner, (long) theFile->owner
                       );
-          sl_strlcat(msg, tmp, SH_BUFSIZE); 
+          sl_strlcat(msg, tmp, SH_MSG_BUF); 
 #ifdef REPLACE_OLD
           if ((modi_mask & MODI_USR) != 0) {
@@ -3255 +3275 @@
         {
 #ifdef SH_USE_XML
-          sl_snprintf(tmp, SH_BUFSIZE, 
+          sl_snprintf(tmp, SH_MSG_BUF, 
                       _("group_old=\"%s\" group_new=\"%s\" igroup_old=\"%ld\" igroup_new=\"%ld\" "),
                       p->theFile.c_group, theFile->c_group,
                       (long) p->theFile.group, (long) theFile->group);
 #else
-          sl_snprintf(tmp, SH_BUFSIZE, 
+          sl_snprintf(tmp, SH_MSG_BUF, 
                       _("group_old=<%s>, group_new=<%s>, igroup_old=<%ld>, igroup_new=<%ld>, "),
                       p->theFile.c_group, theFile->c_group,
@@ -3266 +3286 @@
 #endif
 
-          sl_strlcat(msg, tmp, SH_BUFSIZE); 
+          sl_strlcat(msg, tmp, SH_MSG_BUF); 
 #ifdef REPLACE_OLD
           if ((modi_mask & MODI_GRP) != 0) {
@@ -3280 +3300 @@
       if ((modi_mask & MODI_SIZ) != 0)
         {
-          sl_snprintf(tmp, SH_BUFSIZE, sh_hash_size_format(),
+          sl_snprintf(tmp, SH_MSG_BUF, sh_hash_size_format(),
                       (UINT64) p->theFile.size, 
                       (UINT64) theFile->size);
-          sl_strlcat(msg, tmp, SH_BUFSIZE); 
+          sl_strlcat(msg, tmp, SH_MSG_BUF); 
 #ifdef REPLACE_OLD
           if (sh.flag.reportonce == S_TRUE && sh.flag.update == S_FALSE)
@@ -3295 +3315 @@
           (void) sh_unix_gmttime (theFile->ctime,   timstr2c, sizeof(timstr2c));
 #ifdef SH_USE_XML
-          sl_snprintf(tmp, SH_BUFSIZE, _("ctime_old=\"%s\" ctime_new=\"%s\" "),
+          sl_snprintf(tmp, SH_MSG_BUF, _("ctime_old=\"%s\" ctime_new=\"%s\" "),
                       timstr1c, timstr2c);
 #else
-          sl_snprintf(tmp, SH_BUFSIZE, _("ctime_old=<%s>, ctime_new=<%s>, "),
+          sl_snprintf(tmp, SH_MSG_BUF, _("ctime_old=<%s>, ctime_new=<%s>, "),
                       timstr1c, timstr2c);
 #endif
-          sl_strlcat(msg, tmp, SH_BUFSIZE); 
+          sl_strlcat(msg, tmp, SH_MSG_BUF); 
 #ifdef REPLACE_OLD
           if (sh.flag.reportonce == S_TRUE && sh.flag.update == S_FALSE)
@@ -3313 +3333 @@
           (void) sh_unix_gmttime (theFile->atime,   timstr2a, sizeof(timstr2a));
 #ifdef SH_USE_XML
-          sl_snprintf(tmp, SH_BUFSIZE, _("atime_old=\"%s\" atime_new=\"%s\" "),
+          sl_snprintf(tmp, SH_MSG_BUF, _("atime_old=\"%s\" atime_new=\"%s\" "),
                       timstr1a, timstr2a);
 #else
-          sl_snprintf(tmp, SH_BUFSIZE, _("atime_old=<%s>, atime_new=<%s>, "),
+          sl_snprintf(tmp, SH_MSG_BUF, _("atime_old=<%s>, atime_new=<%s>, "),
                       timstr1a, timstr2a);
 #endif
-          sl_strlcat(msg, tmp, SH_BUFSIZE); 
+          sl_strlcat(msg, tmp, SH_MSG_BUF); 
 #ifdef REPLACE_OLD
           if (sh.flag.reportonce == S_TRUE && sh.flag.update == S_FALSE)
@@ -3331 +3351 @@
           (void) sh_unix_gmttime (theFile->mtime,   timstr2m, sizeof(timstr2m));
 #ifdef SH_USE_XML
-          sl_snprintf(tmp, SH_BUFSIZE, _("mtime_old=\"%s\" mtime_new=\"%s\" "),
+          sl_snprintf(tmp, SH_MSG_BUF, _("mtime_old=\"%s\" mtime_new=\"%s\" "),
                       timstr1m, timstr2m);
 #else
-          sl_snprintf(tmp, SH_BUFSIZE, _("mtime_old=<%s>, mtime_new=<%s>, "),
+          sl_snprintf(tmp, SH_MSG_BUF, _("mtime_old=<%s>, mtime_new=<%s>, "),
                       timstr1m, timstr2m);
 #endif
-          sl_strlcat(msg, tmp, SH_BUFSIZE); 
+          sl_strlcat(msg, tmp, SH_MSG_BUF); 
 #ifdef REPLACE_OLD
           if (sh.flag.reportonce == S_TRUE && sh.flag.update == S_FALSE)
@@ -3347 +3367 @@
       if ((modi_mask & MODI_CHK) != 0)
         {
-          sl_snprintf(tmp, SH_BUFSIZE, 
+          sl_snprintf(tmp, SH_MSG_BUF, 
 #ifdef SH_USE_XML
                       _("chksum_old=\"%s\" chksum_new=\"%s\" "),
@@ -3354 +3374 @@
 #endif
                       p->theFile.checksum, fileHash);
-          sl_strlcat(msg, tmp, SH_BUFSIZE); 
+          sl_strlcat(msg, tmp, SH_MSG_BUF); 
 #ifdef REPLACE_OLD
           if (sh.flag.reportonce == S_TRUE && sh.flag.update == S_FALSE)
@@ -3381 +3401 @@
             tmp_lnk_old = sh_util_strdup("-");
 #ifdef SH_USE_XML
-          sl_snprintf(tmp, SH_BUFSIZE, _("link_old=\"%s\" link_new=\"%s\" "),
+          sl_snprintf(tmp, SH_MSG_BUF, _("link_old=\"%s\" link_new=\"%s\" "),
                       tmp_lnk_old, tmp_lnk);
 #else
-          sl_snprintf(tmp, SH_BUFSIZE, _("link_old=<%s>, link_new=<%s>"),
+          sl_snprintf(tmp, SH_MSG_BUF, _("link_old=<%s>, link_new=<%s>"),
                       tmp_lnk_old, tmp_lnk);
 #endif
           SH_FREE(tmp_lnk);
           SH_FREE(tmp_lnk_old);
-          sl_strlcat(msg, tmp, SH_BUFSIZE); 
+          sl_strlcat(msg, tmp, SH_MSG_BUF); 
 #ifdef REPLACE_OLD
           if (sh.flag.reportonce == S_TRUE && sh.flag.update == S_FALSE)
@@ -3908 +3928 @@
                                        (unsigned char *)linkpath, 
                                        strlen(linkpath));
+
       clen = dlen * 2 + 1;
+
       do {
         if (decompressed)
@@ -3920 +3942 @@
           { fprintf(stderr, _("Error: Data corrupt or incomplete\n")); return -1; }
       } while (res == Z_BUF_ERROR || clen == clen_o);
+
       decompressed[clen] = '\0';
       fputs( (char*) decompressed, stdout);
@@ -3957 +3980 @@
     }
 
-  line = SH_ALLOC(MAX_PATH_STORE+1);
+  line = SH_ALLOC(MAX_PATH_STORE+2);
 
   if ( SL_ISERROR(fd = sl_open_read(db_file, SL_YESPRIV))) 
@@ -3969 +3992 @@
   /* fast forward to start of data
    */
-  sh_hash_setdataent(fd, line, MAX_PATH_STORE, db_file);
+  sh_hash_setdataent(fd, line, MAX_PATH_STORE+1, db_file);
 
   while (1) 
     {
-      p = sh_hash_getdataent (fd, line, MAX_PATH_STORE);
+      p = sh_hash_getdataent (fd, line, MAX_PATH_STORE+1);
       if ((p != NULL) && (p->fullpath[0] == '/'))
         {
@@ -4022 +4045 @@
   if (flag == 0)
     {
-      fprintf(stderr, _("No file found\n"));
+      fprintf(stderr, _("File not found\n"));
       _exit(EXIT_FAILURE);
     }

trunk/src/sh_html.c

@@ -277 +277 @@
 
 static
-int sh_html_get_entry ()
+int sh_html_get_entry (void)
 {
   long      retval = SL_ENONE;
@@ -390 +390 @@
 int comp_arr (const void * ao, const void * bo)
 {
-  sort_arr * a;
-  sort_arr * b;
+  const sort_arr * a;
+  const sort_arr * b;
 
   if (ao == NULL && bo == NULL)
@@ -400 +400 @@
     return (1);
 
-  a = (sort_arr *) ao;
-  b = (sort_arr *) bo;
+  a = (const sort_arr *) ao;
+  b = (const sort_arr *) bo;
 
   return ((-1) * sl_strcmp(a->tim, b->tim));

trunk/src/sh_ignore.c

@@ -157 +157 @@
 }
 
-int sh_ignore_clean ()
+int sh_ignore_clean (void)
 {
   struct sh_ignore_list * new;

trunk/src/sh_mail.c

@@ -131 +131 @@
     }
 
-  buf     = SH_ALLOC( (size_t)(SH_BUFSIZE+1));
-  bufc    = SH_ALLOC( (size_t)(SH_MAXBUF+1));
+  buf     = SH_ALLOC( (size_t)(SH_MSG_BUF+SH_BUFSIZE+1));
+  bufc    = SH_ALLOC( (size_t)(SH_MSG_BUF+SH_MAXBUF+1));
 
   while (1 == 1)
@@ -144 +144 @@
                              sizeof("-----BEGIN MESSAGE-----")-1)) 
         {
-          (void) sh_unix_getline (fd, buf, SH_BUFSIZE);
+          (void) sh_unix_getline (fd, buf, SH_MSG_BUF+SH_BUFSIZE);
           if (buf[0] == '\0')
             {
@@ -163 +163 @@
       while (1 == 1)
         {
-          (void) sh_unix_getline (fd, buf, SH_BUFSIZE);
+          (void) sh_unix_getline (fd, buf, SH_MSG_BUF+SH_BUFSIZE);
           if (0 == sl_strncmp(buf, _("-----BEGIN SIGNATURE-----"),
                               sizeof("-----BEGIN SIGNATURE-----")-1))
@@ -169 +169 @@
           if (buf[0] == '\0') 
             _exit (EXIT_FAILURE);
-          (void) sh_util_compress(bufc, buf, SH_MAXBUF-KEY_LEN);
+          (void) sh_util_compress(bufc, buf, SH_MSG_BUF+SH_MAXBUF-KEY_LEN);
         }
       
@@ -283 +283 @@
   size_t  s;
 
-  char  * dup;
+  char  * dupp;
   char  * p;
   char  * end;
@@ -314 +314 @@
   *ntok = 0;
 
-  dup = sh_util_strdup(argstring);
-  p   = dup;
+  dupp = sh_util_strdup(argstring);
+  p   = dupp;
 
   do
@@ -369 +369 @@
 
   *ntok = i;
-  SH_FREE(dup);
+  SH_FREE(dupp);
 
   SL_RETURN (0, _("sh_filter_filteradd"));
@@ -1888 +1888 @@
   HEADER * header;
   int      type, rdlength, pref;
-  unsigned int count, index;
+  unsigned int count, theindex;
   dnsrep * retval;
 
@@ -1953 +1953 @@
    */
   count = ntohs (header->qdcount); 
-  for (index = 0; index < count; ++index)
+  for (theindex = 0; theindex < count; ++theindex)
     {
       ret = dn_skipname (comp_dn, eom);
@@ -2101 +2101 @@
 static dnsrep * return_mx (char *domain)
 {
-  struct hostent *host = NULL;
+  struct hostent *host;
   dnsrep * answers = NULL;
   mx     * result;
-  dnsrep * retval  = NULL;
+  dnsrep * retval;
   char     errmsg[128];
   size_t   len;
@@ -2144 +2144 @@
 
       SH_MUTEX_LOCK(mutex_resolv);
+
+      host   = NULL;
+      retval = NULL;
+
       if (domain != NULL)
         host = /*@-unrecog@*/sh_gethostbyname (domain)/*@+unrecog@*/;

trunk/src/sh_mem.c

@@ -43 +43 @@
 #include "sh_pthread.h"
 
-extern int safe_logger (int signal, int method, char * details);
+extern int safe_logger (int thesignal, int method, char * details);
 
 #undef  FIL__
@@ -258 +258 @@
 
 
-void sh_mem_free (void * a, char * file, int line)
-{
-  volatile memlist_t * this   = memlist;
-  volatile memlist_t * before = memlist;
+void sh_mem_free (void * aa, char * file, int line)
+{
+  memlist_t * this;
+  memlist_t * before;
   unsigned long        size   = 0;
-
+  void      * a;
   SL_ENTER(_("sh_mem_free"));
 
@@ -269 +269 @@
   SH_MUTEX_RECURSIVE_LOCK(mutex_mem);
 
+  a      = aa;
+  this   = memlist;
+  before = memlist;
+  
   if ( a == NULL ) 
     {
@@ -315 +319 @@
   free(a);
   if (this)
-    free((void*)this);
+    free(this);
   ++Free_Count;
   --Now_Alloc_Count;

trunk/src/sh_portcheck.c

@@ -179 +179 @@
     }
 
-  val = (val <= 0 ? 60 : val);
-
   sh_portchk_interval = (time_t) val;
   SL_RETURN(0, _("sh_portchk_set_interval"));
@@ -251 +249 @@
 /* Interface to initialize port check
  */
-int sh_portchk_init ();
+int sh_portchk_init (struct mod_type * arg);
 
 /* Interface to reset port check
  */
-int sh_portchk_reset ();
+int sh_portchk_reset (void);
 
 /* Interface to run port check
  */
-int sh_portchk_check ();
+int sh_portchk_check (void);
 
 
@@ -317 +315 @@
  * Thereafter, we check for entries that are still UNKN.
  */
-static void sh_portchk_reset_lists ()
+static void sh_portchk_reset_lists (void)
 {
   struct sh_portentry * portlist;
@@ -364 +362 @@
 }
   
+/* These variables are not used anywhere. They only exist
+ * to assign &pre, &ptr to them, which keeps gcc from
+ * putting it into a register, and avoids the 'clobbered
+ * by longjmp' warning. And no, 'volatile' proved insufficient.
+ */
+static void * sh_dummy_pre = NULL;
+static void * sh_dummy_ptr = NULL;
+
 /* check the list of open ports for any that are marked as UNKN
  */
@@ -372 +378 @@
   char errbuf[256];
 
+  /* Take the address to keep gcc from putting them into registers. 
+   * Avoids the 'clobbered by longjmp' warning. 
+   */
+  sh_dummy_pre = (void*) &pre;
+  sh_dummy_ptr = (void*) &ptr;
+ 
   while (ptr)
     {
@@ -817 +829 @@
           flags = retry_fcntl(FIL__, __LINE__, fd, F_GETFL, 0);
           retry_fcntl(FIL__, __LINE__, fd, F_SETFL, flags | O_NONBLOCK);
-          write (fd, _("SSH-2.0-Foobar"), 14);
-          write (fd, "\r\n", 2);
+          retval = write (fd, _("SSH-2.0-Foobar"), 14);
+          if (retval > 0) retval = write (fd, "\r\n", 2);
         }
       else if (port == 25)  /* smtp */
@@ -824 +836 @@
           flags = retry_fcntl(FIL__, __LINE__, fd, F_GETFL, 0);
           retry_fcntl(FIL__, __LINE__, fd, F_SETFL, flags | O_NONBLOCK);
-          write (fd, _("QUIT"), 4);
-          write (fd, "\r\n", 2);
+          retval = write (fd, _("QUIT"), 4);
+          if (retval > 0) retval = write (fd, "\r\n", 2);
         }
       else if (port == 79)  /* finger */
@@ -831 +843 @@
           flags = retry_fcntl(FIL__, __LINE__, fd, F_GETFL, 0);
           retry_fcntl(FIL__, __LINE__, fd, F_SETFL, flags | O_NONBLOCK);
-          write (fd, "\r\n", 2);
+          retval = write (fd, "\r\n", 2);
         }
       else if (port == 110) /* pop3 */
@@ -837 +849 @@
           flags = retry_fcntl(FIL__, __LINE__, fd, F_GETFL, 0);
           retry_fcntl(FIL__, __LINE__, fd, F_SETFL, flags | O_NONBLOCK);
-          write (fd, _("QUIT"), 4);
-          write (fd, "\r\n", 2);
+          retval = write (fd, _("QUIT"), 4);
+          if (retval > 0) retval = write (fd, "\r\n", 2);
         }
       else if (port == 143) /* imap */
@@ -844 +856 @@
           flags = retry_fcntl(FIL__, __LINE__, fd, F_GETFL, 0);
           retry_fcntl(FIL__, __LINE__, fd, F_SETFL, flags | O_NONBLOCK);
-          write (fd, _("A01 LOGOUT"), 10);
-          write (fd, "\r\n", 2);
-        }
+          retval = write (fd, _("A01 LOGOUT"), 10);
+          if (retval > 0) retval = write (fd, "\r\n", 2);
+        }
+
+      if (portchk_debug && retval < 0)
+        fprintf(stderr, _("check port: error writing to port %5d\n"), 
+                port);
      }
   close (fd);
@@ -878 +894 @@
 {
   struct hostent * hent;
-  int              i = 0;
+  volatile int     i; /* might be clobbered by ‘longjmp’ or ‘vfork’*/
   char errbuf[256];
 
@@ -899 +915 @@
   SH_MUTEX_LOCK(mutex_resolv);
   hent = sh_gethostbyname(portchk_hostname);
-
+  i = 0;
   while (hent && hent->h_addr_list[i] && (iface_list.used < SH_IFACE_MAX))
     {
@@ -945 +961 @@
 
 #if !defined(TEST_ONLY)
-int sh_portchk_reconf ()
+int sh_portchk_reconf (void)
 {
   SH_MUTEX_LOCK(mutex_port_check);
@@ -962 +978 @@
 }
 
-int sh_portchk_cleanup ()
+int sh_portchk_cleanup (void)
 {
   return sh_portchk_reconf ();
@@ -983 +999 @@
 static int check_port_generic (int port, int type, int protocol)
 {
-  int              i    =  0;
+  volatile int     i    =  0;
   int              sock = -1;
   int              flag =  1; /* non-zero to enable an option */
@@ -1002 +1018 @@
       if ((sock = socket(AF_INET, type, protocol)) < 0 )
         {
+          ++i;
 #ifdef TEST_ONLY
           if (portchk_debug)
@@ -1010 +1027 @@
                           sh_error_message(errno, errbuf, sizeof(errbuf)), _("socket"));
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
-          ++i;
+#endif
           continue;
-#endif
         }
       if ( setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
                       (void *) &flag, sizeof(flag)) < 0 )
         {
+          ++i;
 #ifdef TEST_ONLY
           if (portchk_debug)
@@ -1026 +1043 @@
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
 #endif
-          ++i;
           continue;
         }
@@ -1056 +1072 @@
 
 
-static int sh_portchk_scan_ports_generic (int min_port, int max_port, int type, int protocol)
+static int sh_portchk_scan_ports_generic (int min_port, int max_port_arg, int type, int protocol)
 {
   /*
@@ -1063 +1079 @@
   */
 
-  int port;
+  volatile int port; /*  might be clobbered by ‘longjmp’ or ‘vfork’*/
+  volatile int max_port = max_port_arg;
   int retval;
   int sock   = -1;
@@ -1444 +1461 @@
 int sh_portchk_check ()
 {
-  int min_port = 0;
+  volatile int min_port;
 
   SH_MUTEX_LOCK(mutex_port_check);
+
+  min_port = 0;
+
   if (sh_portchk_active != S_FALSE)
     {

trunk/src/sh_prelude.c

@@ -723 +723 @@
         *tmp = '\0';
 
+        /* Get interface 
+         */
         ip = strdup(ptr);
         if ( ip ) {
@@ -769 +771 @@
         *tmp = '\0';
 
+        /* Get port number
+         */
         port = strtol(ptr, &end, 0);
         if ( *ptr && *end == '\0' && port >= 0 && port < 65536) {
@@ -810 +814 @@
         *tmp = '\0';
 
+        /* Get service
+         */
         srv = strdup(ptr);
         if ( srv ) {
@@ -830 +836 @@
                 }
 
-                ret = idmef_service_new_ident(service, &str);
+                ret = idmef_service_new_name(service, &str);
                 if ( ret < 0 ) {
                         free(srv);

trunk/src/sh_processcheck.c

@@ -394 +394 @@
 } 
 
+/* These variables are not used anywhere. They only exist
+ * to assign &userold, &user to them, which keeps gcc from
+ * putting them into a register, and avoids the 'clobbered
+ * by longjmp' warning. And no, 'volatile' proved insufficient.
+ */
+static void * sh_dummy_watchlist = NULL;
+
 static void check_watchlist (short * res)
 {
@@ -399 +406 @@
   char * tmp;
   size_t indx;
+
+  /* Take the address to keep gcc from putting them into registers. 
+   * Avoids the 'clobbered by longjmp' warning. 
+   */
+  sh_dummy_watchlist = (void*) &list;
 
   while (list) 
@@ -409 +421 @@
             {
               SH_MUTEX_LOCK(mutex_thread_nolog);
+              tmp = sh_util_safe_name (list->str);
               sh_error_handle(sh_prochk_severity, FIL__, __LINE__, 0, 
                               MSG_PCK_MISS,
-                              list->str);
+                              tmp);
               SH_MUTEX_UNLOCK(mutex_thread_nolog);
             }
@@ -428 +441 @@
               if (S_FALSE == is_in_list(&list_missing, list->str, 0))
                 {
+                  SH_MUTEX_LOCK(mutex_thread_nolog);
                   tmp = sh_util_safe_name (list->str);
-                  SH_MUTEX_LOCK(mutex_thread_nolog);
                   sh_error_handle(sh_prochk_severity, FIL__, __LINE__, 0, 
                                   MSG_PCK_MISS, 
@@ -594 +607 @@
     }
 
-  val = (val <= 0 ? 60 : val);
-
   sh_prochk_interval = (time_t) val;
   SL_RETURN(0, _("sh_prochk_set_interval"));
@@ -625 +636 @@
 static int proc_max_pid (size_t * procpid)
 {
+  char * ret;
   unsigned long  pid;
   FILE * fd;
@@ -640 +652 @@
         {
           str[0] = '\0';
-          fgets(str, 128, fd);
-          if (*str != '\0')
+          ret = fgets(str, 128, fd);
+          if (ret && *str != '\0')
             {
               pid = strtoul(str, &ptr, 0);
@@ -1055 +1067 @@
 static int sh_process_check_int (short * res)
 {
-  size_t i, j;
+  volatile size_t i;
+  size_t j;
   char  tests[512];
-  int   retval;
+  volatile int   retval;
 
   pid_t this_pid;
@@ -1207 +1220 @@
 /* Initialise. 
  */
-static int sh_prochk_init_internal() 
+static int sh_prochk_init_internal(void) 
 {
   SL_ENTER(_("sh_prochk_init"));
@@ -1267 +1280 @@
 int sh_prochk_check(void) 
 {
-  int status = 0;
+  int status;
 
   SL_ENTER(_("sh_prochk_check"));
 
   SH_MUTEX_LOCK(mutex_proc_check);
+
+  status = 0;
+
   if( ShProchkActive != S_FALSE )
     {

trunk/src/sh_pthread.c

@@ -22 +22 @@
 }
 
-int sh_pthread_init_threadspecific()
+int sh_pthread_init_threadspecific(void)
 {
   int rc = 0;
 #ifdef SH_STEALTH
-  extern int sh_g_thread();
+  extern int sh_g_thread(void);
 
   rc = sh_g_thread();

trunk/src/sh_readconf.c

@@ -96 +96 @@
 
 typedef struct str_ListSections {
-  char * name;
+  const char * name;
   int    type;
 } sh_str_ListSections;
@@ -721 +721 @@
 
 typedef struct _cfg_options {
-  char * optname;
+  const char * optname;
   ShSectionType   section;
   ShSectionType   alt_section;
@@ -1111 +1111 @@
 {
   char * key;
-  char * value;
+  const char * value;
   char * tmp;
   int    i;
@@ -1120 +1120 @@
 #endif
 
-  static char  *dummy = N_("dummy");
-
-  static char  *closing[] = {
+  static const char  *dummy = N_("dummy");
+
+  static const char  *closing[] = {
     N_("closecommand"),
     NULL
   };
 
-  static char  *ident[] = {
+  static const char  *ident[] = {
     N_("severityreadonly"),
     N_("severitylogfiles"),

trunk/src/sh_socket.c

@@ -178 +178 @@
 static void sh_socket_add2list (struct socket_cmd * in);
 
-static void sh_socket_probe4reload ()
+static void sh_socket_probe4reload (void)
 {
   struct reload_cmd  * new;
@@ -222 +222 @@
 }
 
-char * sh_get_sockpass ()
+char * sh_get_sockpass (void)
 {
   size_t j = 0;
@@ -236 +236 @@
 }
 
-void sh_set_sockpass ()
+void sh_set_sockpass (void)
 {
   int j;

trunk/src/sh_static.c

@@ -283 +283 @@
 }
 
+struct passwd * getpwuid(uid_t uid)
+{
+        return sh_getpwuid(uid);
+}
+
 struct group * sh_getgrgid(gid_t gid)
 {
@@ -293 +298 @@
 }
 
+struct group * getgrgid(gid_t gid)
+{
+        return sh_getgrgid(gid);
+}
 
 struct passwd * sh_getpwnam(const char *name)
@@ -1560 +1569 @@
 }
 
-static int __open_nameservers()
+static int __open_nameservers(void)
 {
         FILE *fp;
@@ -1887 +1896 @@
 
         if(type == AF_INET) {
-                unsigned char *tmp_addr = (unsigned char *)addr;
+                const unsigned char *tmp_addr = (const unsigned char *)addr;
 
                 memcpy(&in->s_addr, addr, len);

trunk/src/sh_suidchk.c

@@ -859 +859 @@
   int             fflags;
   char          * fs;
-  long            sl_status = SL_ENONE;
+  long            sl_status;
   file_type       theFile;
   char            fileHash[2*(KEY_LEN + 1)];
 
-  struct sh_dirent * dirlist = NULL;
-  struct sh_dirent * dirlist_orig = NULL;
+  struct sh_dirent * dirlist;
+  struct sh_dirent * dirlist_orig;
   char errbuf[SH_ERRBUF_SIZE];
 
@@ -896 +896 @@
   SH_MUTEX_LOCK(mutex_readdir);
 
+  dirlist      = NULL;
+  dirlist_orig = NULL;
+
   do {
 
@@ -918 +921 @@
 
   dirlist_orig = dirlist;
+
+  sl_status = SL_ENONE;
 
   do {
@@ -1345 +1350 @@
 
 
-static void sh_suidchk_free_schedule ()
+static void sh_suidchk_free_schedule (void)
 {
   sh_schedule_t * current = ShSuidchkSched;

trunk/src/sh_tiger0.c

@@ -64 +64 @@
 #if defined(TIGER_64_BIT)
 
-void tiger_t(word64 *str, word64 length, word64 * res);
-void tiger(word64 *str, word64 length, word64 * res);
+void tiger_t(const word64 *str, word64 length, word64 * res);
+void tiger(const word64 *str, word64 length, word64 * res);
 
 #ifdef TIGER_DBG
@@ -75 +75 @@
 #endif
 #else
-void tiger(sh_word32 *str, sh_word32 length, sh_word32 * res);
-void tiger_t(sh_word32 *str, sh_word32 length, sh_word32 * res);
+void tiger(const sh_word32 *str, sh_word32 length, sh_word32 * res);
+void tiger_t(const sh_word32 *str, sh_word32 length, sh_word32 * res);
 
 #ifdef TIGER_DBG
@@ -139 +139 @@
 
 #if defined(TIGER_64_BIT)
-#define TIGER_CAST (word64*)
+#define TIGER_CAST (const word64*)
   /* word64 res[3]; */
   res[0]= (word64) 0x0123456789ABCDEFLL;
@@ -145 +145 @@
   res[2]= (word64) 0xF096A5B4C3B2E187LL;
 #else
-#define TIGER_CAST (sh_word32*)
+#define TIGER_CAST (const sh_word32*)
   /* sh_word32 res[6]; */
   res[0]= (sh_word32) 0x89ABCDEF;

trunk/src/sh_tiger1.c

@@ -267 +267 @@
 
 void
-tiger_t(sh_word32 *str, sh_word32 length, sh_word32 res[6])
+tiger_t(const sh_word32 *str, sh_word32 length, sh_word32 res[6])
 {
   register sh_word32 i;

trunk/src/sh_tiger1_64.c

@@ -404 +404 @@
 }
 
-void tiger(word64 *str, word64 length, word64 res[3])
+void tiger(const word64 *str, word64 length, word64 res[3])
 {
   register word64 i;

trunk/src/sh_tools.c

@@ -475 +475 @@
   char   * host_name;
 
-  int    fd = (-1);
+  volatile int    fd = (-1);
   int    status;
-  int    fail   = 0;
+  volatile int    fail   = 0;
   int    cached = 0;
 
@@ -522 +522 @@
 #endif
         {
+          SH_MUTEX_LOCK(mutex_resolv);
+
           host_name = NULL;
-
-          SH_MUTEX_LOCK(mutex_resolv);
 
           host_entry = sh_gethostbyname(address);

trunk/src/sh_unix.c

@@ -356 +356 @@
 extern int OnlyStderr; 
 
-int safe_logger (int signal, int method, char * details)
+int safe_logger (int thesignal, int method, char * details)
 {
   unsigned int i = 0;
@@ -396 +396 @@
   if (p && *p)
     sl_strlcat(msg, p, 128);
-  if (signal == 0)
+  if (thesignal == 0)
     {
       if (details == NULL) {
@@ -408 +408 @@
     {
       sl_strlcat(msg, _("]: exit on signal "), 128);
-      p = safe_itoa(signal, str, 128);
+      p = safe_itoa(thesignal, str, 128);
       if (p && *p)
         sl_strlcat(msg, p, 128);
@@ -461 +461 @@
 }
 
-void safe_fatal (char * details, 
-                 char * file, int line)
+void safe_fatal (const char * details, 
+                 const char * file, int line)
 {
   char msg[128];
   char str[128];
   char * p;
-  int  signal = 0;
+  int  thesignal = 0;
   int  method = 0;
 
@@ -479 +479 @@
   }
   sl_strlcat(msg, details, 128);
-  (void) safe_logger (signal, method, msg);
+  (void) safe_logger (thesignal, method, msg);
   _exit(EXIT_FAILURE);
 }
@@ -1060 +1060 @@
 }
 
-extern uid_t   sl_trust_baduid();
-extern gid_t   sl_trust_badgid();
+extern uid_t   sl_trust_baduid(void);
+extern gid_t   sl_trust_badgid(void);
 
 #if defined(HOST_IS_CYGWIN) || defined(__cygwin__) || defined(__CYGWIN32__) || defined(__CYGWIN__)
@@ -1562 +1562 @@
   struct hostent * he1;
   int              i;
-  int              ddot = 0;
+  int              ddot;
   int              len;
   char           * p;
@@ -1632 +1632 @@
    */
   len = sl_strlen(sh.host.name);
+  ddot = 0;
   for (i = 0; i < len; ++i) 
     if (sh.host.name[i] == '.') ++ddot; 
@@ -1660 +1661 @@
   struct hostent * he1;
   int              i;
-  int              ddot = 0;
+  int              ddot;
   int              len;
   char             hostname[1024];
@@ -1691 +1692 @@
    */
   len = sl_strlen(sh.host.name);
+  ddot = 0;
   for (i = 0; i < len; ++i) 
     if (sh.host.name[i] == '.') ++ddot; 
@@ -1772 +1774 @@
 }
 
-int sh_unix_chroot()
+int sh_unix_chroot(void)
 {
   int status;
@@ -1794 +1796 @@
 /* #ifdef SH_WITH_SERVER */
 #else
-int sh_unix_chroot() { return 0; }
+int sh_unix_chroot(void) { return 0; }
 #endif
 
@@ -1850 +1852 @@
   pid_t  oldpid = getpid();
 #if defined(SH_WITH_SERVER) 
-  extern int sh_socket_open_int ();
+  extern int sh_socket_open_int (void);
 #endif
   char errbuf[SH_ERRBUF_SIZE];
@@ -3411 +3413 @@
               UINT64 length_nolim = TIGER_NOLIM;
 
-              if ((theFile->check_mask & MODI_TXT) != 0 && fbuf.st_size < (10 * SH_TXT_MAX))
+              if (MODI_TXT_ENABLED(theFile->check_mask) && fbuf.st_size < (10 * SH_TXT_MAX))
                 {
                   sl_init_content (rval_open, fbuf.st_size);
@@ -3464 +3466 @@
               UINT64 length_nolim = TIGER_NOLIM;
 
-              if ((theFile->check_mask & MODI_TXT) != 0 && fbuf.st_size < (10 * SH_TXT_MAX))
+              if (MODI_TXT_ENABLED(theFile->check_mask) && fbuf.st_size < (10 * SH_TXT_MAX))
                 {
                   sl_init_content (rval_open, fbuf.st_size);
@@ -4301 +4303 @@
 SH_MUTEX_STATIC(mutex_mlock,PTHREAD_MUTEX_INITIALIZER);
 
-int sh_unix_mlock (char * file, int line, void * in_addr, size_t len)
+int sh_unix_mlock (const char * file, int line, void * in_addr, size_t len)
 {
   int         num_pages;

trunk/src/sh_utils.c

@@ -313 +313 @@
 char * sh_util_strsep (char **str, const char *delim) 
 {
-  char *ret, *c, *d;
+  char *ret, *c;
+  const char *d;
 
   SL_ENTER(_("sh_util_strsep"));
@@ -321 +322 @@
 
   for (c = *str; *c != '\0'; c++) {
-    for (d = (char *) delim; *d != '\0'; d++) {
+    for (d = delim; *d != '\0'; d++) {
       if (*c == *d) {
         *c = '\0';
@@ -1476 +1477 @@
 
   for (i = 0; i < 6; ++i)
-    bufy[i] = taus_get(&(skey->rng0[0]), &(skey->rng1[0]), &(skey->rng2[0]));
+    bufy[i] = taus_get();
 
   p = sh_tiger_hash ((char *) bufy, TIGER_DATA, 
@@ -1508 +1509 @@
   const int     sh_val_utf8_4 = 4;
 
-  size_t        len = strlen((char *)str);
+  size_t        len = strlen((const char *)str);
   size_t        l   = 0;
   int           typ = 0;
@@ -2102 +2103 @@
         {
           if (lin == 0)
-            lin = strlen((char *)instr);
+            lin = strlen((const char *)instr);
 
           do {
@@ -2149 +2150 @@
 
   *out = SH_ALLOC(outlen);
-  return sh_util_base64_enc((unsigned char *)*out, (unsigned char *)in, inlen);
+  return sh_util_base64_enc((unsigned char *)*out, (const unsigned char *)in, inlen);
 }
 
@@ -2164 +2165 @@
     {
       if (lin == 0)
-        lin = strlen((char *)in);
+        lin = strlen((const char *)in);
 
       for (i = 0; i < lin; i++)
@@ -2189 +2190 @@
           else if (c == ')' || c == '/')
             {
-              b = 64;
+              b = 63;
             }
           else if (c == '?' || c == '=')

trunk/src/sh_utmp.c

@@ -472 +472 @@
  *************/
 
-static int sh_utmp_init_internal ()
+static int sh_utmp_init_internal (void)
 {
 
@@ -516 +516 @@
  *************/
 #ifdef HAVE_UTTYPE
-static int sh_utmp_login_clean();
+static int sh_utmp_login_clean(void);
 #endif
 
@@ -633 +633 @@
 int sh_utmp_set_login_timer (const char * c)
 {
-  int retval = 0;
   long val;
 
@@ -644 +643 @@
                        _("utmp timer"), c);
       SH_MUTEX_UNLOCK(mutex_thread_nolog);
-      retval = -1;
-    }
-
-  val = (val <= 0 ? 60 : val);
+      SL_RETURN((-1), _("sh_utmp_set_login_timer"));
+    }
 
   ShUtmpInterval = (time_t) val;
@@ -670 +667 @@
 static struct login_ct * login_ct_list = NULL;
 
-static int sh_utmp_login_clean()
+static int sh_utmp_login_clean(void)
 {
   struct login_ct * list = login_ct_list;
@@ -776 +773 @@
  * by longjmp' warning. And no, 'volatile' proved insufficient.
  */
-void * sh_dummy_userold = NULL;
-void * sh_dummy_user    = NULL;
+static void * sh_dummy_userold = NULL;
+static void * sh_dummy_user    = NULL;
 
 
@@ -1063 +1060 @@
   int           error;
   struct SH_UTMP_S * ut;
-  unsigned long this_read = 0;
+  unsigned long this_read;
   int           val_retry;
 
@@ -1123 +1120 @@
    * we need to do this here
    */
+  this_read = 0;
+
   if (mode < 2)
     {

trunk/src/slib.c

@@ -123 +123 @@
 }
 
-FILE * sl_tracefile_open(char * file, char * mode)
+FILE * sl_tracefile_open(const char * file, const char * mode)
 {
   FILE * xp = NULL;
@@ -132 +132 @@
 }
 
-void sl_trace_in(char * str, char * file, int line)
+void sl_trace_in(const char * str, const char * file, int line)
 {
   int    i;
@@ -165 +165 @@
 }
 
-void sl_trace_out(char * str, char * file, int line)
+void sl_trace_out(const char * str, const char * file, int line)
 {
   int    i;
@@ -200 +200 @@
 }
 
-extern int sh_log_console (char * msg);
+extern int sh_log_console (const char * msg);
 
 static int dlogActive = 0;
@@ -215 +215 @@
  *      = 3 backtrace
  */
-int dlog (int flag, char * file, int line,  const char *fmt, ...)
+int dlog (int flag, const char * file, int line,  const char *fmt, ...)
 {
   va_list     ap;
@@ -1496 +1496 @@
  * Do nothing if not SUID.
  */
-int sl_policy_get_user(char * user)
+int sl_policy_get_user(const char * user)
 {
   SL_ENTER(_("sl_policy_get_user"));
@@ -2444 +2444 @@
 
 
-int sl_write (SL_TICKET ticket, void * msg_in, long nbytes)
+int sl_write (SL_TICKET ticket, const void * msg_in, long nbytes)
 {
   long bytewritten;
@@ -2450 +2450 @@
   int  fd;
 
-  char * msg; 
+  const char * msg; 
 
   SL_ENTER(_("sl_write"));
@@ -2461 +2461 @@
     SL_IRETURN(fd, _("sl_write"));
 
-  msg = (char *) msg_in;
+  msg = (const char *) msg_in;
 
   /* write
@@ -2485 +2485 @@
 }
 
-int sl_write_line (SL_TICKET ticket, void * msg, long nbytes)
+int sl_write_line (SL_TICKET ticket, const void * msg, long nbytes)
 {
   int  status;
@@ -2582 +2582 @@
 
 
-char * sl_trust_errfile()
+char * sl_trust_errfile(void)
 {
   return &tf_path[0];
@@ -2588 +2588 @@
 
 extern uid_t tf_baduid;
-uid_t   sl_trust_baduid()
+uid_t   sl_trust_baduid(void)
 {
   return tf_baduid;
@@ -2594 +2594 @@
 
 extern gid_t tf_badgid;
-gid_t   sl_trust_badgid()
+gid_t   sl_trust_badgid(void)
 {
   return tf_badgid;
@@ -2602 +2602 @@
 static int trust_count = 0;
 
-int  sl_trust_purge_user ()
+int  sl_trust_purge_user (void)
 {
   int i;

trunk/src/trustfile.c

@@ -781 +781 @@
           register int lsym;            /* num chars in symlink ref  */
           register int i;               /* trustworthy or not?       */
+          const char * t_const;
 
           /*
@@ -821 +822 @@
               /* smack on the /../ 
                */
-              t = "/../";
+              t_const = "/../";
               while(*t && b < &full[MAXFILENAME])
-                *b++ = *t++;
+                *b++ = *t_const++;
 
               /* append the symlink referent