gcc 12, autotool updates, sqwebmail fixes.

5 files changed, 27 insertions, 38 deletions

diff --git a/pcp/configure.ac b/pcp/configure.ac
index 9b64527..0fee882 100644
--- a/pcp/configure.ac
+++ b/pcp/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 # Copyright 2001-2003 Double Precision, Inc.  See COPYING for
 # distribution information.
 
-AC_INIT(pcp, 0.10, [courier-users@lists.sourceforge.net])
+AC_INIT([pcp],[0.10],[courier-users@lists.sourceforge.net])
 
 >confdefs.h  # Kill PACKAGE_ macros
 
@@ -15,11 +15,9 @@ AC_CONFIG_HEADERS(config.h)
 dnl Checks for programs.
 AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
-AC_PROG_CC_C99
 AC_PROG_AWK
 AC_PROG_INSTALL
-AC_LIBTOOL_DLOPEN
-AM_PROG_LIBTOOL
+LT_INIT
 AC_PATH_PROGS(PERL, perl5 perl, perl)
 
 CFLAGS="-I.. -I${srcdir}/.. -I$srcdir/../.. -I../.. $CFLAGS"
@@ -85,16 +83,16 @@ SENDIT="$scriptdir/sendit.sh"
 AC_SUBST(SENDIT)
 
 dnl Checks for header files.
-AC_HEADER_STDC
+
 AC_CHECK_HEADERS(fcntl.h sys/stat.h sys/time.h termios.h unistd.h)
 AC_HEADER_DIRENT
-AC_HEADER_TIME
+AC_CHECK_HEADERS_ONCE([sys/time.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_UID_T
 AC_TYPE_PID_T
-AC_TYPE_SIGNAL
+
 AC_STRUCT_TM
 AC_SYS_LARGEFILE
 
@@ -178,18 +176,18 @@ AC_SUBST(mailgroup)
 AC_DEFINE_UNQUOTED(MAILGROUP,"$mailgroup",
 	[ Mail system group ])
 
-AC_TRY_COMPILE( [
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <signal.h>
 #include <string.h>
 #include <stdio.h>
-],[
+]], [[
 struct sigaction sa;
 
 memset(&sa, 0, sizeof(sa));
 sa.sa_handler=SIG_IGN;
 sa.sa_flags=SA_NOCLDWAIT;
 sigaction(SIGCHLD, &sa, NULL);
-], AC_DEFINE_UNQUOTED(USE_NOCLDWAIT,1, [ Whether to use SA_NOCLDWAIT ]))
+]])],[AC_DEFINE_UNQUOTED(USE_NOCLDWAIT,1,  Whether to use SA_NOCLDWAIT )],[])
 
 if test -f $srcdir/.debug
 then
@@ -204,4 +202,5 @@ fi
 
 CPPFLAGS="-Iintl/ -I${srcdir}/intl $CPPFLAGS"
 MKINSTALLDIRS="$mkdir_p"
-AC_OUTPUT(Makefile po/Makefile.in   )
+AC_CONFIG_FILES([Makefile po/Makefile.in   ])
+AC_OUTPUT
diff --git a/pcp/pcp.h b/pcp/pcp.h
index 84b4312..29a8ffc 100644
--- a/pcp/pcp.h
+++ b/pcp/pcp.h
@@ -9,18 +9,10 @@
 
 #include "config.h"
 
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
 #include <time.h>
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 
 struct PCP_new_eventid {
 	char *eventid;
@@ -327,7 +319,7 @@ const char *pcp_wdayname(unsigned);	/* Sun, Mon, Tue... */
 const char *pcp_wdayname_long(unsigned); /* Sunday, Monday, ... */
 const char *pcp_monthname(unsigned);	/* Jan, Feb, Mar... */
 const char *pcp_monthname_long(unsigned); /* January, February... */
-int pcp_wday(const char *);	/* Sun, Mon, Tue... -> 0..7, -1 if no match */ 
+int pcp_wday(const char *);	/* Sun, Mon, Tue... -> 0..7, -1 if no match */
 int pcp_month(const char *);	/* Ditto for Jan, Feb, Mar */
 
 int pcp_fmttime(char *, size_t, time_t, int);	/* Format date+time */
@@ -364,7 +356,7 @@ int pcp_parse_datetime_until(time_t start, time_t end,
 			     int *argn,
 			     int argc,
 			     char **argv,
-			    
+
 			     int recurring_time,
 
 			     /* Callback function receives times */
diff --git a/pcp/pcpd.c b/pcp/pcpd.c
index 8f505fc..2a39005 100644
--- a/pcp/pcpd.c
+++ b/pcp/pcpd.c
@@ -94,7 +94,7 @@ static int inputchar(struct PCP *pcp)
 
 		if (termsig)
 			return (EOF);
-			
+
 		if (first_timer)
 		{
 			tvptr= &tv;
@@ -1018,7 +1018,7 @@ static int list_callback(struct PCP_list_all *p, void *vp)
 	ls->last_event= & (*ls->last_event)->next;
 	return (0);
 }
-	
+
 static int list(struct PCP *pcp)
 {
 	struct list_struct ls;
@@ -1589,7 +1589,7 @@ static int doline(struct PCP *pcp, char *p, int acl_flags)
 		force_flag=0;
 		need_rset=0;
 		rset(pcp);
-		printf("200 Ok.\n");	
+		printf("200 Ok.\n");
 		return (0);
 	}
 
@@ -1780,7 +1780,7 @@ static int doline(struct PCP *pcp, char *p, int acl_flags)
 					       proxy_name);
 				else
 					printf("200 Ok.\n");
-			}	
+			}
 			rset(pcp);
 			return (0);
 		}
@@ -1929,15 +1929,11 @@ static int check_acl(int flags, int bit)
 	return (1);
 }
 
-static RETSIGTYPE catch_sig(int sig_num)
+static void catch_sig(int sig_num)
 {
 	termsig=1;
 	signal(SIGALRM, catch_sig);
 	alarm(2);
-
-#if RETSIGTYPE != void
-	return (0);
-#endif
 }
 
 static void setsigs()
diff --git a/pcp/pcpdir.c b/pcp/pcpdir.c
index ba8aad7..aa3298f 100644
--- a/pcp/pcpdir.c
+++ b/pcp/pcpdir.c
@@ -403,9 +403,9 @@ static char *acquire_dotlock(struct PCPdir *pd)
 
 	if (!tmpname)
 	{
-		free(n);
 		fprintf(stderr, "ALERT: Failed to create dotlock: %s - %s\n",
 			n, strerror(errno));
+		free(n);
 		return (NULL);
 	}
 	strcat(strcat(strcat(strcpy(tmpname, pd->dirname), "/."),
@@ -416,9 +416,9 @@ static char *acquire_dotlock(struct PCPdir *pd)
 	if (!fp)
 	{
 		free(tmpname);
-		free(n);
 		fprintf(stderr, "ALERT: Failed to create dotlock: %s - %s\n",
 			n, strerror(errno));
+		free(n);
 		return (NULL);
 	}
 
@@ -428,9 +428,9 @@ static char *acquire_dotlock(struct PCPdir *pd)
 		fclose(fp);
 		unlink(tmpname);
 		free(tmpname);
-		free(n);
 		fprintf(stderr, "ALERT: Failed to create dotlock: %s - %s\n",
 			n, strerror(errno));
+		free(n);
 		return (NULL);
 	}
 
@@ -438,9 +438,9 @@ static char *acquire_dotlock(struct PCPdir *pd)
 	{
 		unlink(tmpname);
 		free(tmpname);
-		free(n);
 		fprintf(stderr, "ALERT: Failed to create dotlock: %s - %s\n",
 			n, strerror(errno));
+		free(n);
 		return (NULL);
 	}
 
diff --git a/pcp/pcpnet.c b/pcp/pcpnet.c
index fd1d70f..e654681 100644
--- a/pcp/pcpnet.c
+++ b/pcp/pcpnet.c
@@ -1897,6 +1897,7 @@ static int retr_105(struct PCPnet *pn, struct PCP_retr *ri)
 		if (ri->callback_retr_date)
 			return ( (*ri->callback_retr_date)
 				 (ri, from_t, to_t, ri->callback_arg));
+		ri->event_id=NULL; /* Fix spurious gcc warning */
 	}
 
 	return (0);
@@ -1916,6 +1917,7 @@ static int retr_106(struct PCPnet *pn, struct PCP_retr *ri)
 		if (ri->callback_retr_participants)
 			return ( (*ri->callback_retr_participants)
 				 (ri, addr, NULL, ri->callback_arg));
+		ri->event_id=NULL; /* Fix spurious gcc warning */
 	}
 
 	return (0);
@@ -1926,7 +1928,7 @@ static int retr_110(struct PCPnet *pn, struct PCP_retr *ri)
 	char dummy;
 	char eventid[EVENTID_MAXLEN];
 
-	if (sscanf(pn->readbuf, "110%c" EVENTID_SSCANF, 
+	if (sscanf(pn->readbuf, "110%c" EVENTID_SSCANF,
 		   &dummy, eventid) == 2)
 	{
 		const char *p, *q;